diff --git a/hub/components/EditWalletRules/index.tsx b/hub/components/EditWalletRules/index.tsx index 802b041873..7c8fd304d6 100644 --- a/hub/components/EditWalletRules/index.tsx +++ b/hub/components/EditWalletRules/index.tsx @@ -58,6 +58,7 @@ function stepName(step: Step): string { interface Props { className?: string; governanceAddress: PublicKey; + realmPk: PublicKey; } export function EditWalletRules(props: Props) { @@ -71,7 +72,7 @@ export function EditWalletRules(props: Props) { const [result] = useQuery(gql.getGovernanceRulesResp, { query: gql.getGovernanceRules, variables: { - realmUrlId: symbol, + realmUrlId: props.realmPk, governancePublicKey: props.governanceAddress.toBase58(), }, }); diff --git a/pages/dao/[symbol]/editConfig.tsx b/pages/dao/[symbol]/editConfig.tsx index 169dbeb45a..b414ba92ba 100644 --- a/pages/dao/[symbol]/editConfig.tsx +++ b/pages/dao/[symbol]/editConfig.tsx @@ -1,13 +1,12 @@ import Head from 'next/head' -import { useRouter } from 'next/router' import { GraphQLProvider } from '@hub/providers/GraphQL' import { JWTProvider } from '@hub/providers/JWT' import { EditRealmConfig } from '@hub/components/EditRealmConfig' +import useSelectedRealmPubkey from '@hooks/selectedRealm/useSelectedRealmPubkey' export default function EditConfigPage() { - const router = useRouter() - const { symbol } = router.query + const realmPk = useSelectedRealmPubkey() return ( <> @@ -19,10 +18,12 @@ export default function EditConfigPage() {
- + {realmPk && ( + + )}
diff --git a/pages/dao/[symbol]/treasury/governance/[governanceId]/edit.tsx b/pages/dao/[symbol]/treasury/governance/[governanceId]/edit.tsx index 32a0dd9539..9127a7ea0b 100644 --- a/pages/dao/[symbol]/treasury/governance/[governanceId]/edit.tsx +++ b/pages/dao/[symbol]/treasury/governance/[governanceId]/edit.tsx @@ -5,6 +5,7 @@ import { PublicKey } from '@solana/web3.js' import { EditWalletRules } from '@hub/components/EditWalletRules' import { GraphQLProvider } from '@hub/providers/GraphQL' import { JWTProvider } from '@hub/providers/JWT' +import useSelectedRealmPubkey from '@hooks/selectedRealm/useSelectedRealmPubkey' export default function EditWallet() { const router = useRouter() @@ -14,8 +15,11 @@ export default function EditWallet() { const governanceAddress = typeof governanceId === 'string' ? new PublicKey(governanceId) : undefined + const realmPk = useSelectedRealmPubkey() + return ( - governanceAddress && ( + governanceAddress && + realmPk && ( <> @@ -26,7 +30,10 @@ export default function EditWallet() {
- +