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

Jump to bottom

Fix/localhost #161

Merged
merged 4 commits into from
Sep 27, 2024
Merged

Fix/localhost #161

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
48b3996
Require verifiedContractAddress state var to be a valid address befor…
portdeveloper Sep 27, 2024
39ac159
Disable decompile button if network === 31337
portdeveloper Sep 27, 2024
2933837
Use a combination of id + name as keys for networks in NetworkOptions
portdeveloper Sep 27, 2024
d8630eb
show only 1 chain when wrong network for 31337
technophile-04 Sep 27, 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
50 changes: 26 additions & 24 deletions packages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/NetworkOptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,35 @@ export const NetworkOptions = ({ hidden = false }: NetworkOptionsProps) => {
const mainChainId = useAbiNinjaState(state => state.mainChainId);
const chains = useGlobalState(state => state.chains);

const filteredChains = chains.filter(allowedNetwork => allowedNetwork.id === mainChainId);
// if chainId is 31337 we render one element, since viem chains have 3 chains with same chainId.
const networksToRender = mainChainId === 31337 ? [filteredChains[0]] : filteredChains;

return (
<>
{chains
.filter(allowedNetwork => allowedNetwork.id === mainChainId)
.map(allowedNetwork => (
<li key={allowedNetwork.id} className={hidden ? "hidden" : ""}>
<button
className="menu-item btn-sm !rounded-xl flex gap-3 py-3 whitespace-nowrap"
type="button"
onClick={() => {
switchChain?.({ chainId: allowedNetwork.id });
}}
>
<ArrowsRightLeftIcon className="h-6 w-4 ml-2 sm:ml-0" />
<span>
Switch to{" "}
<span
style={{
color: getNetworkColor(allowedNetwork, isDarkMode),
}}
>
{allowedNetwork.name}
</span>
{networksToRender.map(allowedNetwork => (
<li key={`${allowedNetwork.id}-${allowedNetwork.name}`} className={hidden ? "hidden" : ""}>
<button
className="menu-item btn-sm !rounded-xl flex gap-3 py-3 whitespace-nowrap"
type="button"
onClick={() => {
switchChain?.({ chainId: allowedNetwork.id });
}}
>
<ArrowsRightLeftIcon className="h-6 w-4 ml-2 sm:ml-0" />
<span>
Switch to{" "}
<span
style={{
color: getNetworkColor(allowedNetwork, isDarkMode),
}}
>
{allowedNetwork.id === 31337 ? "Localhost" : allowedNetwork.name}
</span>
</button>
</li>
))}
</span>
</button>
</li>
))}
</>
);
};
3 changes: 2 additions & 1 deletion packages/nextjs/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const Home: NextPage = () => {
setContractAbi(contractData.abi);
}

if (network === "31337") {
if (network === "31337" && isAddress(verifiedContractAddress)) {
setActiveTab(TabName.addressAbi);
setLocalAbiContractAddress(verifiedContractAddress);
return;
Expand Down Expand Up @@ -243,6 +243,7 @@ const Home: NextPage = () => {
<button
className="btn btn-primary min-h-fit h-10 px-4 text-base font-semibold border-2 hover:bg-neutral hover:text-primary"
onClick={() => fetchAbiFromHeimdall(localAbiContractAddress as Address)}
disabled={network === "31337"}
>
{isFetchingAbi ? <span className="loading loading-spinner"></span> : "Decompile (beta)"}
</button>
Expand Down
Loading