Skip to content
Binary file modified bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion components/nav/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const Navbar: React.FC = () => {

return (
<>
<nav className="h-30 sticky top-0 w-full flex-col gap-2 border-b border-b-neutral-100 bg-neutral-0 p-3 md:px-6 md:pb-0 md:pt-5 lg:gap-3">
<nav className="h-30 sticky top-0 z-10 w-full flex-col gap-2 border-b border-b-neutral-100 bg-neutral-0 p-3 md:px-6 md:pb-0 md:pt-5 lg:gap-3">
<div className="flex w-full items-center justify-between">
<Link
href="/"
Expand Down
2 changes: 1 addition & 1 deletion components/proposal/cardResources.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { IProposalResource } from "@/utils/types";
import { Card, CardEmptyState, Heading, IconType, Link } from "@aragon/ods";
import React from "react";

interface ICardResourcesProps {
export interface ICardResourcesProps {
displayLink?: boolean;
resources?: IProposalResource[];
title: string;
Expand Down
6 changes: 5 additions & 1 deletion constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ export const PUB_DELEGATION_CONTRACT_ADDRESS = (process.env.NEXT_PUBLIC_DELEGATI

// TOUCAN VOTING
export const PUB_TOUCAN_VOTING_PLUGIN_ADDRESS = (process.env.NEXT_PUBLIC_TOUCAN_VOTING_PLUGIN_ADDRESS ?? "") as Address;
export const PUB_OFT_ADAPTER_ADDRESSS = (process.env.NEXT_PUBLIC_OFT_ADAPTER_ADDRESS ?? "") as Address;
export const PUB_OFT_ADAPTER_ADDRESS = (process.env.NEXT_PUBLIC_OFT_ADAPTER_ADDRESS ?? "") as Address;
export const PUB_OFT_TOKEN_BRIDGE_ADDRESS = (process.env.NEXT_PUBLIC_OFT_TOKEN_BRIDGE_ADDRESS ?? "") as Address;
export const PUB_TOUCAN_RECEIVER_ADDRESS = (process.env.NEXT_PUBLIC_TOUCAN_RECEIVER_ADDRESS ?? "") as Address;
export const PUB_TOUCAN_VOTING_PLUGIN_L2_ADDRESS = (process.env.NEXT_PUBLIC_TOUCAN_VOTING_PLUGIN_L2_ADDRESS ??
"") as Address;
Expand All @@ -28,6 +29,9 @@ export const PUB_DELEGATION_ANNOUNCEMENTS_START_BLOCK = BigInt(
export const PUB_CHAIN_NAME = (process.env.NEXT_PUBLIC_CHAIN_NAME ?? "sepolia") as ChainName;
export const PUB_CHAIN = getChain(PUB_CHAIN_NAME);

export const PUB_L2_CHAIN_NAME = (process.env.NEXT_PUBLIC_L2_CHAIN_NAME ?? "arbitrumSepolia") as ChainName;
export const PUB_L2_CHAIN = getChain(PUB_L2_CHAIN_NAME);

// Network and services
export const PUB_ALCHEMY_API_KEY = process.env.NEXT_PUBLIC_ALCHEMY_API_KEY ?? "";

Expand Down
6 changes: 5 additions & 1 deletion context/Alerts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export type AlertOptions = {
description?: string;
txHash?: string;
timeout?: number;
explorerLinkOverride?: string;
};

export interface AlertContextProps {
Expand Down Expand Up @@ -49,7 +50,10 @@ export const AlertProvider: React.FC<{ children: React.ReactNode }> = ({ childre
description: alertOptions?.description,
type: alertOptions?.type ?? "info",
};
if (alertOptions?.txHash && client) {
// allow the user to override the explorer link
if (alertOptions?.explorerLinkOverride) {
newAlert.explorerLink = alertOptions.explorerLinkOverride;
} else if (alertOptions?.txHash && client) {
newAlert.explorerLink = client.chain.blockExplorers?.default.url + "/tx/" + alertOptions.txHash;
}
const timeout = alertOptions?.timeout ?? DEFAULT_ALERT_TIMEOUT;
Expand Down
11 changes: 6 additions & 5 deletions context/Web3Modal.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { http, createConfig } from "wagmi";
import { injected } from "wagmi/connectors";
import { walletConnect, coinbaseWallet } from "wagmi/connectors";
import { walletConnect } from "wagmi/connectors";
import {
PUB_APP_DESCRIPTION,
PUB_APP_NAME,
PUB_CHAIN,
PUB_L2_CHAIN,
PUB_PROJECT_URL,
PUB_WALLET_CONNECT_PROJECT_ID,
PUB_WALLET_ICON,
PUB_WEB3_ENDPOINT,
PUB_WEB3_ENDPOINT_L2,
} from "@/constants";
import { mainnet, optimismSepolia } from "viem/chains";
import { mainnet } from "viem/chains";

// wagmi config
const metadata = {
Expand All @@ -22,12 +22,13 @@ const metadata = {
};

export const config = createConfig({
chains: [PUB_CHAIN, mainnet, optimismSepolia],
chains: [PUB_CHAIN, mainnet, PUB_L2_CHAIN],
syncConnectedChain: true,
ssr: true,
transports: {
[PUB_CHAIN.id]: http(PUB_WEB3_ENDPOINT, { batch: true }),
[PUB_L2_CHAIN.id]: http(PUB_WEB3_ENDPOINT_L2, { batch: true }),
[mainnet.id]: http(PUB_WEB3_ENDPOINT, { batch: true }),
[optimismSepolia.id]: http(PUB_WEB3_ENDPOINT_L2, { batch: true }),
},
connectors: [
walletConnect({
Expand Down
1 change: 1 addition & 0 deletions hooks/useAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export function useAction(action: Action) {
}, [action.data, action.to, isLoading]);

return {
...action,
isLoading,
functionName,
functionAbi,
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
},
"dependencies": {
"@aragon/ods": "1.0.30",
"@layerzerolabs/lz-definitions": "^2.3.27",
"@layerzerolabs/lz-v2-utilities": "^2.3.27",
"@layerzerolabs/scan-client": "^0.0.8",
"@react-native-async-storage/async-storage": "^1.23.1",
"@shazow/whatsabi": "0.11.0",
"@tanstack/query-async-storage-persister": "^5.49.1",
Expand All @@ -33,7 +36,7 @@
"dayjs": "^1.11.10",
"dompurify": "^3.0.11",
"ipfs-http-client": "^60.0.1",
"next": "14.1.4",
"next": "14.2.4",
"react": "^18.2.0",
"react-blockies": "^1.4.1",
"react-dom": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion pages/plugins/[id].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const PluginLoader: FC = () => {
if (!PageComponent) {
if (componentLoading) {
return (
<div>
<div className="flex h-screen w-screen items-center justify-center">
<PleaseWaitSpinner />
</div>
);
Expand Down
56 changes: 28 additions & 28 deletions plugins/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,34 @@ type PluginItem = {
};

export const plugins: PluginItem[] = [
{
id: "core-proposals",
folderName: "dualGovernance",
title: "Core team proposals",
icon: IconType.APP_MEMBERS,
pluginAddress: PUB_DUAL_GOVERNANCE_PLUGIN_ADDRESS,
},
{
id: "community-proposals",
folderName: "tokenVoting",
title: "Community proposals",
icon: IconType.BLOCKCHAIN_BLOCKCHAIN,
pluginAddress: PUB_TOKEN_VOTING_PLUGIN_ADDRESS,
},
{
id: "lock-to-vote",
folderName: "lockToVote",
title: "Morpho Vault",
icon: IconType.BLOCKCHAIN_BLOCK,
pluginAddress: PUB_LOCK_TO_VOTE_PLUGIN_ADDRESS,
},
{
id: "delegate-wall",
folderName: "delegateAnnouncer",
title: "Delegation",
icon: IconType.FEEDBACK,
pluginAddress: PUB_DELEGATION_CONTRACT_ADDRESS,
},
// {
// id: "core-proposals",
// folderName: "dualGovernance",
// title: "Core team proposals",
// icon: IconType.APP_MEMBERS,
// pluginAddress: PUB_DUAL_GOVERNANCE_PLUGIN_ADDRESS,
// },
// {
// id: "community-proposals",
// folderName: "tokenVoting",
// title: "Community proposals",
// icon: IconType.BLOCKCHAIN_BLOCKCHAIN,
// pluginAddress: PUB_TOKEN_VOTING_PLUGIN_ADDRESS,
// },
// {
// id: "lock-to-vote",
// folderName: "lockToVote",
// title: "Morpho Vault",
// icon: IconType.BLOCKCHAIN_BLOCK,
// pluginAddress: PUB_LOCK_TO_VOTE_PLUGIN_ADDRESS,
// },
// {
// id: "delegate-wall",
// folderName: "delegateAnnouncer",
// title: "Delegation",
// icon: IconType.FEEDBACK,
// pluginAddress: PUB_DELEGATION_CONTRACT_ADDRESS,
// },
{
id: "crosschain-voting",
folderName: "toucanVoting",
Expand Down
Loading