Skip to content

Commit

Permalink
refactor: performance
Browse files Browse the repository at this point in the history
  • Loading branch information
montelaidev committed Jun 21, 2024
1 parent 2ff50d5 commit 13a33b9
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions ui/pages/permissions-connect/choose-account/choose-account.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ const ChooseAccount = ({
const [selectedAccounts, setSelectedAccounts] = useState(
selectedAccountAddresses,
);
const evmAccounts = accounts.filter((account) =>
isEvmAccountType(account.type),
);
const t = useI18nContext();

const handleAccountClick = (address) => {
Expand All @@ -46,9 +49,7 @@ const ChooseAccount = ({

const selectAll = () => {
const newSelectedAccounts = new Set(
accounts
.filter((account) => isEvmAccountType(account.type))
.map((account) => account.address),
evmAccounts.map((account) => account.address),
);
setSelectedAccounts(newSelectedAccounts);
};
Expand All @@ -58,17 +59,12 @@ const ChooseAccount = ({
};

const allAreSelected = () => {
return (
accounts.filter((account) => isEvmAccountType(account.type)).length ===
selectedAccounts.size
);
return evmAccounts.length === selectedAccounts.size;
};

const hasNonEvmAccounts = () => {
return Object.keys(selectedAccountAddresses).some(
(address) => !isEthAddress(address),
);
};
// If lengths are different, this means `accounts` holds some non-EVM accounts
const hasNonEvmAccounts =
Object.keys(selectedAccountAddresses).length > evmAccounts.length;

const getHeaderText = () => {
if (accounts.length === 0) {
Expand Down Expand Up @@ -136,7 +132,7 @@ const ChooseAccount = ({
cancelText={t('cancel')}
onSubmit={() => selectAccounts(selectedAccounts)}
submitText={t('next')}
disabled={hasNonEvmAccounts() || selectedAccounts.size === 0}
disabled={hasNonEvmAccounts || selectedAccounts.size === 0}
/>
</Box>
</>
Expand Down

0 comments on commit 13a33b9

Please sign in to comment.