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.

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

fix: resolved socket multiple instances getting created #585

Merged
merged 1 commit into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ export const SpaceBanner: React.FC<ISpaceBannerProps> = ({
setSpaceWidgetId(spaceData?.spaceId as string);
};

usePushSpaceSocket({ account, env });

// Check if the spaceData is not available, show the skeleton loading effect
if (!spaceData) {
return <SpaceBannerLoadingSkeleton />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { WidgetHeader } from './WidgetHeader';
import { ISpaceWidgetProps } from '../exportedTypes';
import { isHostOfSpace, isMemberOfSpace } from './helpers/utils';

import { usePushSpaceSocket, useSpaceData } from '../../../hooks';
import { useSpaceData } from '../../../hooks';

import { ThemeContext } from '../theme/ThemeProvider';

Expand Down Expand Up @@ -41,8 +41,6 @@ export const SpaceWidget: React.FC<ISpaceWidgetProps> = (
const { getSpaceInfo, setSpaceInfo, account, env, spaceInfo } =
useSpaceData();

usePushSpaceSocket({ account, env });

useEffect(() => {
if (!spaceId) {
return;
Expand Down
32 changes: 32 additions & 0 deletions packages/uiweb/src/lib/dataProviders/SpaceComponentsWrapper.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import React from 'react';
import { usePushSpaceSocket, useSpaceData, useSpaceNotificationSocket } from '../hooks';

export interface ISpacesComponentsWrapperProps {
children: React.ReactNode;
}

export const SpaceComponentWrapper = ({
children,
}: ISpacesComponentsWrapperProps) => {
const {
account,
env,
acceptSpaceRequest,
connectSpaceRequest
} = useSpaceData();

useSpaceNotificationSocket({
account,
env,
acceptSpaceRequest,
connectSpaceRequest,
});

usePushSpaceSocket({ account, env });

return (
<div>
{children}
</div>
);
};
13 changes: 4 additions & 9 deletions packages/uiweb/src/lib/dataProviders/SpaceDataProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useRef, useState } from 'react';
import { SignerType, SpaceDTO, SpaceIFeeds } from '@pushprotocol/restapi';

import { SpaceComponentWrapper } from './SpaceComponentsWrapper';
import { SpacesUI } from '../components';
import { ThemeContext } from '../components/space/theme/ThemeProvider';
import { ISpacesTheme, lightTheme } from '../components/space/theme';
Expand Down Expand Up @@ -384,20 +385,14 @@ export const SpacesUIProvider = ({
const PROVIDER_THEME = Object.assign({}, lightTheme, theme);

spaceUI.init();
useSpaceNotificationSocket({
account,
env,
acceptSpaceRequest,
connectSpaceRequest,
});
// usePushSpaceSocket({ account, env });
// console.log("isPushSDKSocketConnected", isPushSDKSocketConnected);

return (
<LivepeerConfig client={livepeerClient}>
<ThemeContext.Provider value={PROVIDER_THEME}>
<SpaceDataContext.Provider value={value}>
{children}
<SpaceComponentWrapper>
{children}
</SpaceComponentWrapper>
</SpaceDataContext.Provider>
</ThemeContext.Provider>
</LivepeerConfig>
Expand Down
1 change: 0 additions & 1 deletion packages/uiweb/src/lib/hooks/space/usePushSpaceSocket.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export const usePushSpaceSocket = ({
);

pushSpaceSocket?.on('SPACES', async (spaceInfo: SpaceDTO) => {
console.log(spaceInfo, spaceRequests, popularSpaces, mySpaces);

/* TODO: In future, store all space info in SpaceInfo state itself, and mySpaces, popularSpaces, requests only store spaceId
so as to only update spaceInfo once and it should reflect at every place*/
Expand Down