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

[bugfix] just use realm pks when talking to governance-api #1921

Merged
merged 2 commits into from
Nov 14, 2023
Merged

[bugfix] just use realm pks when talking to governance-api #1921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04a76bc
just use realm pks when talking to governance-api
asktree Nov 13, 2023
3603e02
typo
asktree Nov 14, 2023
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
3 changes: 2 additions & 1 deletion hub/components/EditWalletRules/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ function stepName(step: Step): string {
interface Props {
className?: string;
governanceAddress: PublicKey;
realmPk: PublicKey;
}

export function EditWalletRules(props: Props) {
Expand All @@ -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(),
},
});
Expand Down
15 changes: 8 additions & 7 deletions pages/dao/[symbol]/editConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
<>
Expand All @@ -19,10 +18,12 @@ export default function EditConfigPage() {
<meta property="og:title" content="Edit Org Config" key="title" />
</Head>
<div className="dark">
<EditRealmConfig
className="min-h-screen"
realmUrlId={symbol as string}
/>
{realmPk && (
<EditRealmConfig
className="min-h-screen"
realmUrlId={realmPk.toString()}
/>
)}
</div>
</GraphQLProvider>
</JWTProvider>
Expand Down
11 changes: 9 additions & 2 deletions pages/dao/[symbol]/treasury/governance/[governanceId]/edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -14,8 +15,11 @@ export default function EditWallet() {
const governanceAddress =
typeof governanceId === 'string' ? new PublicKey(governanceId) : undefined

const realmPk = useSelectedRealmPubkey()

return (
governanceAddress && (
governanceAddress &&
realmPk && (
<>
<JWTProvider>
<GraphQLProvider>
Expand All @@ -26,7 +30,10 @@ export default function EditWallet() {
</Head>
<div className="dark w-full max-w-3xl mx-auto">
<div className="dark:bg-neutral-900 rounded px-4 lg:px-8">
<EditWalletRules governanceAddress={governanceAddress} />
<EditWalletRules
governanceAddress={governanceAddress}
realmPk={realmPk}
/>
</div>
</div>
</GraphQLProvider>
Expand Down
Loading