Skip to content

Commit c4a2fb7

Browse files
authored
Merge pull request #2719 from daostack/CW-some-stream-disappear
Some streams disappear when clicking subspace stream
2 parents d4d5306 + 7bc0954 commit c4a2fb7

File tree

9 files changed

+530
-449
lines changed

9 files changed

+530
-449
lines changed

src/pages/OldCommon/hooks/useCommonMember.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ export const useCommonMember = (options: Options = {}): Return => {
141141
loading: false,
142142
fetched: true,
143143
data: {
144+
commonId,
144145
...commonMember,
145146
...generateCirclesDataForCommonMember(
146147
governance.circles,
@@ -189,7 +190,7 @@ export const useCommonMember = (options: Options = {}): Return => {
189190
}
190191
}
191192
},
192-
[state, userId],
193+
[state, userId, commonId],
193194
);
194195

195196
const setCommonMember = useCallback(

src/pages/OldCommon/hooks/useCommonMembers.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export const useCommonMembers = ({ commonId }: Options): Return => {
141141

142142
const user = cachedUserStates[commonMember.userId]?.data;
143143

144-
return user ? [...acc, { ...commonMember, user }] : acc;
144+
return user ? [...acc, { ...commonMember, user, commonId }] : acc;
145145
}, []);
146146

147147
return {
@@ -178,7 +178,7 @@ export const useCommonMembers = ({ commonId }: Options): Return => {
178178
({ uid }) => uid === commonMember.userId,
179179
);
180180

181-
return user ? [...acc, { ...commonMember, user }] : acc;
181+
return user ? [...acc, { ...commonMember, user, commonId }] : acc;
182182
}, []);
183183

184184
return {
@@ -198,7 +198,7 @@ export const useCommonMembers = ({ commonId }: Options): Return => {
198198
}));
199199
}
200200
})();
201-
}, [commonMembersState.data]);
201+
}, [commonMembersState.data, commonId]);
202202

203203
return {
204204
...state,

0 commit comments

Comments
 (0)