Skip to content

Fix external wallets list to automatically show other wallets when total count of wallets is 15 or below #2312

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

Merged
BboyStatix merged 4 commits into from
Dec 1, 2025
Merged

Fix external wallets list to automatically show other wallets when total count of wallets is 15 or below #2312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57587c0
refactor show more wallets state for more clarity
BboyStatix Nov 28, 2025
9272c4c
automatically show all wallets if below the show more wallets threshold
BboyStatix Nov 28, 2025
d2e4329
automatically show all wallets in main list if total wallets <= 15 and
BboyStatix Dec 1, 2025
1e6bbd6
handle the case where chain changes but no of wallets is unchanged
BboyStatix Dec 1, 2025
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
14 changes: 12 additions & 2 deletions packages/modal/src/ui/components/ConnectWallet/ConnectWallet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ANALYTICS_EVENTS, type ChainNamespaceType, log, type WALLET_CONNECTOR_TYPE, WALLET_CONNECTORS } from "@web3auth/no-modal";
import { FormEvent, useContext, useMemo, useState } from "react";
import { FormEvent, useContext, useEffect, useMemo, useState } from "react";

import { CONNECT_WALLET_PAGES } from "../../constants";
import { AnalyticsContext } from "../../context/AnalyticsContext";
Expand Down Expand Up @@ -126,7 +126,6 @@ function ConnectWallet(props: ConnectWalletProps) {

const handleChainFilterChange = (chain: string) => {
setSelectedChain(chain);
setIsShowAllWallets(false);
};

const filteredButtons = useMemo(() => {
Expand All @@ -153,6 +152,16 @@ function ConnectWallet(props: ConnectWalletProps) {
return walletDiscoverySupported ? defaultButtons.length : installedWalletButtons.length;
}, [walletDiscoverySupported, defaultButtons, installedWalletButtons, isShowAllWallets, totalExternalWalletsCount]);

// Automatically show all wallets if there are less than or equal to 15 wallets
// also resets everytime we search causing no. of wallets to change or select different chain
useEffect(() => {
if (walletDiscoverySupported && totalExternalWalletsCount <= 15) {
setIsShowAllWallets(true);
} else {
setIsShowAllWallets(false);
}
}, [walletDiscoverySupported, selectedChain, totalExternalWalletsCount]);

/**
* Wallet click logic
* - For installed wallets
Expand Down Expand Up @@ -289,6 +298,7 @@ function ConnectWallet(props: ConnectWalletProps) {
deviceDetails={deviceDetails}
walletConnectUri={walletConnectUri}
buttonRadius={buttonRadius}
isShowAllWallets={isShowAllWallets}
/>
</div>
)}
Expand Down
11 changes: 5 additions & 6 deletions packages/modal/src/ui/components/ConnectWallet/ConnectWalletList/ConnectWalletList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useState } from "react";
import { useTranslation } from "react-i18next";

import i18n from "../../../localeImport";
Expand Down Expand Up @@ -114,20 +113,20 @@ function ConnectWalletList(props: ConnectWalletListProps) {
deviceDetails,
walletConnectUri,
buttonRadius,
isShowAllWallets,
} = props;

const [showMoreWallets, setShowMoreWallets] = useState(true);

const onShowMoreWalletsClick = () => {
setShowMoreWallets(false);
handleMoreWallets();
};

const showMoreWalletsButton = !isShowAllWallets;

return (
<>
<ul
className={cn("w3a--overflow-y-auto w3a--flex w3a--flex-col w3a--gap-y-2 w3a--h-[280px] w3a--social-container w3a--pr-2.5", {
"w3a--h-[328px]": !showMoreWallets,
"w3a--h-[328px]": !showMoreWalletsButton,
})}
>
{externalButtons.length === 0 ? (
Expand All @@ -143,7 +142,7 @@ function ConnectWalletList(props: ConnectWalletListProps) {
/>
)}
</ul>
{showMoreWallets && totalExternalWalletsCount > 15 && !isLoading && initialWalletCount < totalExternalWalletsCount && (
{showMoreWalletsButton && !isLoading && initialWalletCount < totalExternalWalletsCount && (
<MoreWalletsButton
totalExternalWalletsCount={totalExternalWalletsCount}
initialWalletCount={initialWalletCount}
Expand Down
1 change: 1 addition & 0 deletions packages/modal/src/ui/components/ConnectWallet/ConnectWalletList/ConnectWalletList.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface ConnectWalletListProps {
buttonRadius: ButtonRadiusType;
handleWalletClick: (button: ExternalButton) => void;
handleMoreWallets: () => void;
isShowAllWallets: boolean;
}

export type WalletsFoundProps = Pick<
Expand Down