diff --git a/.changeset/khaki-poems-attack.md b/.changeset/khaki-poems-attack.md new file mode 100644 index 000000000000..f34004f2517d --- /dev/null +++ b/.changeset/khaki-poems-attack.md @@ -0,0 +1,5 @@ +--- +"ledger-live-desktop": patch +--- + +LLD - Fixed accounts order after changing countervalue in the settings diff --git a/apps/ledger-live-desktop/src/renderer/screens/accounts/index.tsx b/apps/ledger-live-desktop/src/renderer/screens/accounts/index.tsx index f89c6ae55d6c..9784d5f25b87 100644 --- a/apps/ledger-live-desktop/src/renderer/screens/accounts/index.tsx +++ b/apps/ledger-live-desktop/src/renderer/screens/accounts/index.tsx @@ -1,4 +1,4 @@ -import React, { useCallback } from "react"; +import React, { useCallback, useMemo } from "react"; import { useSelector } from "react-redux"; import { useHistory } from "react-router-dom"; import styled from "styled-components"; @@ -6,10 +6,7 @@ import { Account, AccountLike } from "@ledgerhq/types-live"; import TrackPage, { setTrackingSource } from "~/renderer/analytics/TrackPage"; import Box from "~/renderer/components/Box"; import { Redirect } from "react-router"; -import { - useFlattenSortAccounts, - useRefreshAccountsOrderingEffect, -} from "~/renderer/actions/general"; +import { useFlattenSortAccounts } from "~/renderer/actions/general"; import { accountsSelector, starredAccountsSelector } from "~/renderer/reducers/accounts"; import { accountsViewModeSelector, selectedTimeRangeSelector } from "~/renderer/reducers/settings"; import AccountList from "./AccountList"; @@ -23,11 +20,12 @@ export default function AccountsPage() { const flattenedAccounts = useFlattenSortAccounts({ enforceHideEmptySubAccounts: true, }); - const accounts = mode === "card" ? flattenedAccounts : rawAccounts; + const accounts = useMemo( + () => (mode === "card" ? flattenedAccounts : rawAccounts), + [mode, flattenedAccounts, rawAccounts], + ); const history = useHistory(); - useRefreshAccountsOrderingEffect({ - onMount: true, - }); + const onAccountClick = useCallback( (account: AccountLike, parentAccount?: Account | null) => { setTrackingSource("accounts page"); diff --git a/apps/ledger-live-desktop/tests/specs/general/layout.spec.ts-snapshots/accounts-linux.png b/apps/ledger-live-desktop/tests/specs/general/layout.spec.ts-snapshots/accounts-linux.png index 56b4024099af..4a9ff944a1a9 100644 Binary files a/apps/ledger-live-desktop/tests/specs/general/layout.spec.ts-snapshots/accounts-linux.png and b/apps/ledger-live-desktop/tests/specs/general/layout.spec.ts-snapshots/accounts-linux.png differ