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

Jump to bottom

fix: blank screen on offline support if user id is lazily set #2003

Merged
merged 2 commits into from
Mar 13, 2023
Merged

fix: blank screen on offline support if user id is lazily set #2003

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
59f00fe
fix: blank screen on offline support if user id is lazily set
santhoshvai Mar 13, 2023
072dc6a
chore: change the initial state value of initialisedDb
santhoshvai Mar 13, 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
12 changes: 6 additions & 6 deletions package/src/components/Chat/Chat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const ChatWithContext = <
closeConnectionOnBackground,
);

const [initialisingDatabase, setInitialisingDatabase] = useState(enableOfflineSupport);
const [initialisedDatabase, setInitialisedDatabase] = useState(false);

/**
* Setup muted user listener
Expand All @@ -194,20 +194,20 @@ const ChatWithContext = <
data: client.user,
});
}
}, [client]);
}, [client, enableOfflineSupport]);

const setActiveChannel = (newChannel?: Channel<StreamChatGenerics>) => setChannel(newChannel);

useEffect(() => {
if (client.user?.id && enableOfflineSupport) {
setInitialisingDatabase(true);
setInitialisedDatabase(false);
QuickSqliteClient.initializeDatabase();
DBSyncManager.init(client as unknown as StreamChat);
setInitialisingDatabase(false);
setInitialisedDatabase(true);
}
}, [client?.user?.id, enableOfflineSupport]);

const appSettings = useAppSettings(client, isOnline, enableOfflineSupport, initialisingDatabase);
const appSettings = useAppSettings(client, isOnline, enableOfflineSupport, initialisedDatabase);

const chatContext = useCreateChatContext({
appSettings,
Expand All @@ -226,7 +226,7 @@ const ChatWithContext = <
enableOfflineSupport,
});

if (loadingTranslators || initialisingDatabase) return null;
if (loadingTranslators) return null;

return (
<ChatProvider<StreamChatGenerics> value={chatContext}>
Expand Down
7 changes: 3 additions & 4 deletions package/src/components/Chat/hooks/useAppSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@ export const useAppSettings = <
client: StreamChat<StreamChatGenerics>,
isOnline: boolean | null,
enableOfflineSupport: boolean,
initialisingDatabase: boolean,
initialisedDatabase: boolean,
): AppSettingsAPIResponse | null => {
const [appSettings, setAppSettings] = useState<AppSettingsAPIResponse | null>(null);
const isMounted = useRef(true);

useEffect(() => {
async function enforeAppSettings() {
if (initialisingDatabase) return;
if (!client.userID) return;

if (!isOnline && enableOfflineSupport) {
if (!isOnline && enableOfflineSupport && initialisedDatabase) {
const appSettings = dbApi.getAppSettings({ currentUserId: client.userID });
setAppSettings(appSettings);
return;
Expand Down Expand Up @@ -48,7 +47,7 @@ export const useAppSettings = <
return () => {
isMounted.current = false;
};
}, [client, isOnline, initialisingDatabase]);
}, [client, isOnline, initialisedDatabase]);

return appSettings;
};