Skip to content
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
5 changes: 2 additions & 3 deletions src/frontend/screens/RemovedFromProjectBottomSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
useOwnRoleInProject,
useProjectSettings,
} from '@comapeo/core-react';
import {useActiveProject} from '../contexts/ActiveProjectContext';
import {useActiveProjectIdActions} from '../contexts/ActiveProjectIdStoreContext';
import {UIActivityIndicator} from 'react-native-indicators';
import {ColorCard} from '../sharedComponents/ColorCard';
Expand All @@ -34,11 +35,10 @@ const m = defineMessages({
});

export const RemovedFromProjectBottomSheet = ({
route,
navigation,
}: NativeRootNavigationProps<'RemovedFromProjectBottomSheet'>) => {
const {formatMessage} = useIntl();
const {projectId} = route.params;
const {projectId} = useActiveProject();
const {
data: {reason},
} = useOwnRoleInProject({projectId});
Expand Down Expand Up @@ -88,7 +88,6 @@ export const RemovedFromProjectBottomSheet = ({
createProject.mutate(undefined, {
onError: err => {
const firstProject = projects[0];
//if there is a project just open that project
if (firstProject) {
setActiveProjectId(firstProject.projectId);
navigation.popToTop();
Expand Down
10 changes: 2 additions & 8 deletions src/frontend/sharedComponents/ProjectRemovalListener.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,10 @@ export const ProjectRemovalListener = () => {
navigation.dispatch(
CommonActions.reset({
index: 1,
routes: [
{name: 'Home'},
{
name: 'RemovedFromProjectBottomSheet',
params: {projectId},
},
],
routes: [{name: 'Home'}, {name: 'RemovedFromProjectBottomSheet'}],
}),
);
}, [projectId, navigation]);
}, [navigation]);

//checks on first open of project that the user has not been blocked
React.useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/sharedTypes/navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export type RootStackParamsList = {
InviteReceived: {inviteId: string};
InviteSuccessfullyAccepted: {projectName: string; projectId: string};
InviteCanceled: {projectName: string};
RemovedFromProjectBottomSheet: {projectId: string};
RemovedFromProjectBottomSheet: undefined;
ObservationMetadata: {observationId: string};
ErrorBottomSheet: {error: Error};
BackgroundMapErrorBottomSheet: {title: string; description: string};
Expand Down
Loading