fixing flow and such for routing
This commit is contained in:
@@ -23,14 +23,6 @@ const RouterContext = React.createContext<IRouterContext>({
|
|||||||
export function RouterProvider({ children }: { children: React.ReactNode }) {
|
export function RouterProvider({ children }: { children: React.ReactNode }) {
|
||||||
const [page, setPage] = useState<TPage>('WELCOME');
|
const [page, setPage] = useState<TPage>('WELCOME');
|
||||||
|
|
||||||
const { selectedConversation } = useConversations();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (selectedConversation) {
|
|
||||||
setPage('SELECTED_CONVERSATION');
|
|
||||||
}
|
|
||||||
}, [setPage, selectedConversation]);
|
|
||||||
|
|
||||||
const handleSetPage = useCallback((newPage: TPage) => () => setPage(newPage), [setPage]);
|
const handleSetPage = useCallback((newPage: TPage) => () => setPage(newPage), [setPage]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -17,10 +17,8 @@ import {
|
|||||||
styled,
|
styled,
|
||||||
} from '@mui/material';
|
} from '@mui/material';
|
||||||
import React, { HTMLAttributes, useCallback, useEffect, useState } from 'react';
|
import React, { HTMLAttributes, useCallback, useEffect, useState } from 'react';
|
||||||
import { useDebounce, useKeyPressEvent, useToggle } from 'react-use';
|
|
||||||
|
|
||||||
import CircularProgress from '@mui/material/CircularProgress';
|
import CircularProgress from '@mui/material/CircularProgress';
|
||||||
import CreateConversationRequest from '../../../core/requests/CreateConversationRequest.request';
|
|
||||||
import { FiX } from 'react-icons/fi';
|
import { FiX } from 'react-icons/fi';
|
||||||
import { NirvanaRules } from '../util/rules';
|
import { NirvanaRules } from '../util/rules';
|
||||||
import User from '@nirvana/core/models/user.model';
|
import User from '@nirvana/core/models/user.model';
|
||||||
@@ -103,6 +101,7 @@ export default function NewConversationDialog() {
|
|||||||
if (succeeded) {
|
if (succeeded) {
|
||||||
setSelectedUsers([]);
|
setSelectedUsers([]);
|
||||||
setConversationName('');
|
setConversationName('');
|
||||||
|
handleSetPage('SELECTED_CONVERSATION');
|
||||||
}
|
}
|
||||||
|
|
||||||
setIsSubmitting(false);
|
setIsSubmitting(false);
|
||||||
@@ -113,6 +112,7 @@ export default function NewConversationDialog() {
|
|||||||
setSelectedUsers,
|
setSelectedUsers,
|
||||||
setIsSubmitting,
|
setIsSubmitting,
|
||||||
handleStartConversation,
|
handleStartConversation,
|
||||||
|
handleSetPage,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in New Issue
Block a user