Skip to content

fix: membership #1860

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
sandren merged 2 commits into from
Jun 9, 2026
Merged

fix: membership #1860

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
613a3d4
fix: membership
sandren Jun 9, 2026
1718625
fix: membership
sandren Jun 9, 2026
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
18 changes: 15 additions & 3 deletions apps/web/core/hooks/use-propose-add-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
'use client';

import { daoSpace } from '@geoprotocol/geo-sdk';
import { useMutation } from '@tanstack/react-query';

import { useCallback } from 'react';

import { Effect, Either } from 'effect';
import { type Hex } from 'viem';

import { usePersonalSpaceId } from '~/core/hooks/use-personal-space-id';
import { useSmartAccount } from '~/core/hooks/use-smart-account';
import { useSmartAccountTransaction } from '~/core/hooks/use-smart-account-transaction';
import { useSpace } from '~/core/hooks/use-space';
import { geo } from '~/core/sdk/geo-client';
import { useStatusBar } from '~/core/state/status-bar-store';
import { runEffectEither } from '~/core/telemetry/effect-runtime';
import { SPACE_REGISTRY_ADDRESS } from '~/core/utils/contracts/space-registry';
Expand All @@ -36,6 +38,7 @@ export function useProposeAddEditor({ spaceId }: UseProposeAddEditorArgs) {

const { smartAccount } = useSmartAccount();
const { personalSpaceId, isRegistered } = usePersonalSpaceId();
const { space } = useSpace(spaceId ?? undefined);

const tx = useSmartAccountTransaction({
address: SPACE_REGISTRY_ADDRESS,
Expand Down Expand Up @@ -71,15 +74,24 @@ export function useProposeAddEditor({ spaceId }: UseProposeAddEditorArgs) {
throw new Error(message);
}

// The proposal's addEditor action must call the DAO space contract directly.
if (!space?.address) {
const message = 'No space address found. Please try again.';
console.error('No space address found for space:', spaceId);
dispatch({ type: 'ERROR', payload: message });
throw new Error(message);
}

console.log('Proposing to add editor', {
authorSpaceId: personalSpaceId,
spaceId,
targetEditorSpaceId,
});

const { calldata: callData } = daoSpace.proposeAddEditor({
const { calldata: callData } = geo.daoSpaces.proposeAddEditor({
authorSpaceId: personalSpaceId,
spaceId,
daoSpaceAddress: space.address as Hex,
newEditorSpaceId: targetEditorSpaceId,
votingMode: 'SLOW',
});
Expand Down Expand Up @@ -111,7 +123,7 @@ export function useProposeAddEditor({ spaceId }: UseProposeAddEditorArgs) {
onRight: hash => console.log('Successfully proposed to add editor. Transaction hash:', hash),
});
},
[dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, tx]
[dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, space, tx]
);

const { mutate, status } = useMutation({
Expand Down
18 changes: 15 additions & 3 deletions apps/web/core/hooks/use-propose-add-member.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
'use client';

import { daoSpace } from '@geoprotocol/geo-sdk';
import { useMutation } from '@tanstack/react-query';

import { useCallback } from 'react';

import { Effect, Either } from 'effect';
import { type Hex } from 'viem';

import { usePersonalSpaceId } from '~/core/hooks/use-personal-space-id';
import { useSmartAccount } from '~/core/hooks/use-smart-account';
import { useSmartAccountTransaction } from '~/core/hooks/use-smart-account-transaction';
import { useSpace } from '~/core/hooks/use-space';
import { geo } from '~/core/sdk/geo-client';
import { useStatusBar } from '~/core/state/status-bar-store';
import { runEffectEither } from '~/core/telemetry/effect-runtime';
import { SPACE_REGISTRY_ADDRESS } from '~/core/utils/contracts/space-registry';
Expand All @@ -32,6 +34,7 @@ export function useProposeAddMember({ spaceId }: UseProposeAddMemberArgs) {

const { smartAccount } = useSmartAccount();
const { personalSpaceId, isRegistered } = usePersonalSpaceId();
const { space } = useSpace(spaceId ?? undefined);

const tx = useSmartAccountTransaction({
address: SPACE_REGISTRY_ADDRESS,
Expand Down Expand Up @@ -67,6 +70,14 @@ export function useProposeAddMember({ spaceId }: UseProposeAddMemberArgs) {
throw new Error(message);
}

// The proposal's addMember action must call the DAO space contract directly.
if (!space?.address) {
const message = 'No space address found. Please try again.';
console.error('No space address found for space:', spaceId);
dispatch({ type: 'ERROR', payload: message });
throw new Error(message);
}

const normalizedVotingMode = votingMode === 'slow' ? 'SLOW' : 'FAST';

console.log('Proposing to add member', {
Expand All @@ -76,9 +87,10 @@ export function useProposeAddMember({ spaceId }: UseProposeAddMemberArgs) {
votingMode: normalizedVotingMode,
});

const { calldata: callData } = daoSpace.proposeAddMember({
const { calldata: callData } = geo.daoSpaces.proposeAddMember({
authorSpaceId: personalSpaceId,
spaceId,
daoSpaceAddress: space.address as Hex,
newMemberSpaceId: targetMemberSpaceId,
votingMode: normalizedVotingMode,
});
Expand Down Expand Up @@ -114,7 +126,7 @@ export function useProposeAddMember({ spaceId }: UseProposeAddMemberArgs) {
onRight: hash => console.log('Successfully proposed to add member. Transaction hash:', hash),
});
},
[dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, tx]
[dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, space, tx]
);

const { mutate, status } = useMutation({
Expand Down
18 changes: 15 additions & 3 deletions apps/web/core/hooks/use-propose-remove-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
'use client';

import { daoSpace } from '@geoprotocol/geo-sdk';
import { useMutation } from '@tanstack/react-query';

import { useCallback } from 'react';

import { Effect, Either } from 'effect';
import { type Hex } from 'viem';

import { usePersonalSpaceId } from '~/core/hooks/use-personal-space-id';
import { useSmartAccount } from '~/core/hooks/use-smart-account';
import { useSmartAccountTransaction } from '~/core/hooks/use-smart-account-transaction';
import { useSpace } from '~/core/hooks/use-space';
import { geo } from '~/core/sdk/geo-client';
import { useStatusBar } from '~/core/state/status-bar-store';
import { runEffectEither } from '~/core/telemetry/effect-runtime';
import { SPACE_REGISTRY_ADDRESS } from '~/core/utils/contracts/space-registry';
Expand All @@ -36,6 +38,7 @@ export function useProposeRemoveEditor({ spaceId }: UseProposeRemoveEditorArgs)

const { smartAccount } = useSmartAccount();
const { personalSpaceId, isRegistered } = usePersonalSpaceId();
const { space } = useSpace(spaceId ?? undefined);

const tx = useSmartAccountTransaction({
address: SPACE_REGISTRY_ADDRESS,
Expand Down Expand Up @@ -71,15 +74,24 @@ export function useProposeRemoveEditor({ spaceId }: UseProposeRemoveEditorArgs)
throw new Error(message);
}

// The proposal's removeEditor action must call the DAO space contract directly.
if (!space?.address) {
const message = 'No space address found. Please try again.';
console.error('No space address found for space:', spaceId);
dispatch({ type: 'ERROR', payload: message });
throw new Error(message);
}

console.log('Proposing to remove editor', {
authorSpaceId: personalSpaceId,
spaceId,
targetEditorSpaceId,
});

const { calldata: callData } = daoSpace.proposeRemoveEditor({
const { calldata: callData } = geo.daoSpaces.proposeRemoveEditor({
authorSpaceId: personalSpaceId,
spaceId,
daoSpaceAddress: space.address as Hex,
editorToRemoveSpaceId: targetEditorSpaceId,
votingMode: 'SLOW',
});
Expand Down Expand Up @@ -111,7 +123,7 @@ export function useProposeRemoveEditor({ spaceId }: UseProposeRemoveEditorArgs)
onRight: hash => console.log('Successfully proposed to remove editor. Transaction hash:', hash),
});
},
[dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, tx]
[dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, space, tx]
);

const { mutate, status } = useMutation({
Expand Down
18 changes: 15 additions & 3 deletions apps/web/core/hooks/use-propose-remove-member.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
'use client';

import { daoSpace } from '@geoprotocol/geo-sdk';
import { useMutation } from '@tanstack/react-query';

import { useCallback } from 'react';

import { Effect, Either } from 'effect';
import { type Hex } from 'viem';

import { usePersonalSpaceId } from '~/core/hooks/use-personal-space-id';
import { useSmartAccount } from '~/core/hooks/use-smart-account';
import { useSmartAccountTransaction } from '~/core/hooks/use-smart-account-transaction';
import { useSpace } from '~/core/hooks/use-space';
import { geo } from '~/core/sdk/geo-client';
import { useStatusBar } from '~/core/state/status-bar-store';
import { runEffectEither } from '~/core/telemetry/effect-runtime';
import { SPACE_REGISTRY_ADDRESS } from '~/core/utils/contracts/space-registry';
Expand All @@ -32,6 +34,7 @@ export function useProposeRemoveMember({ spaceId }: UseProposeRemoveMemberArgs)

const { smartAccount } = useSmartAccount();
const { personalSpaceId, isRegistered } = usePersonalSpaceId();
const { space } = useSpace(spaceId ?? undefined);

const tx = useSmartAccountTransaction({
address: SPACE_REGISTRY_ADDRESS,
Expand Down Expand Up @@ -67,6 +70,14 @@ export function useProposeRemoveMember({ spaceId }: UseProposeRemoveMemberArgs)
throw new Error(message);
}

// The proposal's removeMember action must call the DAO space contract directly.
if (!space?.address) {
const message = 'No space address found. Please try again.';
console.error('No space address found for space:', spaceId);
dispatch({ type: 'ERROR', payload: message });
throw new Error(message);
}

const normalizedVotingMode = votingMode === 'slow' ? 'SLOW' : 'FAST';

console.log('Proposing to remove member', {
Expand All @@ -76,9 +87,10 @@ export function useProposeRemoveMember({ spaceId }: UseProposeRemoveMemberArgs)
votingMode: normalizedVotingMode,
});

const { calldata: callData } = daoSpace.proposeRemoveMember({
const { calldata: callData } = geo.daoSpaces.proposeRemoveMember({
authorSpaceId: personalSpaceId,
spaceId,
daoSpaceAddress: space.address as Hex,
memberToRemoveSpaceId: targetMemberSpaceId,
votingMode: normalizedVotingMode,
});
Expand Down Expand Up @@ -114,7 +126,7 @@ export function useProposeRemoveMember({ spaceId }: UseProposeRemoveMemberArgs)
onRight: hash => console.log('Successfully proposed to remove member. Transaction hash:', hash),
});
},
[dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, tx]
[dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, space, tx]
);

const { mutate, status } = useMutation({
Expand Down
18 changes: 15 additions & 3 deletions apps/web/core/hooks/use-request-to-be-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
'use client';

import { daoSpace } from '@geoprotocol/geo-sdk';
import { useMutation } from '@tanstack/react-query';

import { useCallback } from 'react';

import { Effect, Either } from 'effect';
import { type Hex } from 'viem';

import { normalizeSpaceId } from '~/core/access/space-access';
import { usePersonalSpaceId } from '~/core/hooks/use-personal-space-id';
import { useSmartAccount } from '~/core/hooks/use-smart-account';
import { useSmartAccountTransaction } from '~/core/hooks/use-smart-account-transaction';
import { useSpace } from '~/core/hooks/use-space';
import { getIsEditorOfSpace } from '~/core/io/queries';
import { geo } from '~/core/sdk/geo-client';
import { useStatusBar } from '~/core/state/status-bar-store';
import { runEffectEither } from '~/core/telemetry/effect-runtime';
import { SPACE_REGISTRY_ADDRESS } from '~/core/utils/contracts/space-registry';
Expand All @@ -27,6 +29,7 @@ export function useRequestToBeEditor({ spaceId }: UseRequestToBeEditorArgs) {

const { smartAccount } = useSmartAccount();
const { personalSpaceId, isRegistered } = usePersonalSpaceId();
const { space } = useSpace(spaceId ?? undefined);

const tx = useSmartAccountTransaction({
address: SPACE_REGISTRY_ADDRESS,
Expand All @@ -49,6 +52,14 @@ export function useRequestToBeEditor({ spaceId }: UseRequestToBeEditorArgs) {
throw new Error('Invalid target space ID');
}

// The proposal's addEditor action must call the DAO space contract directly.
if (!space?.address) {
const message = 'No space address found. Please try again.';
console.error('No space address found for space:', spaceId);
dispatch({ type: 'ERROR', payload: message });
throw new Error(message);
}

// Existing editors already belong to the space; a duplicate editor request errors on vote.
// Check at submit time rather than via reactive access-control state, which reads false
// while still hydrating and would let a fast click through. Fail open if the check errors.
Expand All @@ -66,9 +77,10 @@ export function useRequestToBeEditor({ spaceId }: UseRequestToBeEditorArgs) {
});

// Caller proposes themselves as a new editor. Editor proposals are slow-path only.
const { calldata: callData } = daoSpace.proposeAddEditor({
const { calldata: callData } = geo.daoSpaces.proposeAddEditor({
authorSpaceId: personalSpaceId,
spaceId,
daoSpaceAddress: space.address as Hex,
newEditorSpaceId: personalSpaceId,
votingMode: 'SLOW',
});
Expand All @@ -95,7 +107,7 @@ export function useRequestToBeEditor({ spaceId }: UseRequestToBeEditorArgs) {
},
onRight: hash => console.log('Successfully requested to be editor. Transaction hash:', hash),
});
}, [dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, tx]);
}, [dispatch, smartAccount, personalSpaceId, isRegistered, spaceId, space, tx]);

const { mutate, status } = useMutation({
mutationFn: handleRequestToBeEditor,
Expand Down
Loading