fix: navigation

Author: OtavioStasiak

app/stacks/MasterDetailStack/index.tsx

@@ -187,7 +187,6 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 				<ModalStack.Screen name='DisplayPrefsView' component={DisplayPrefsView} />
 				<ModalStack.Screen name='AdminPanelView' component={AdminPanelView} />
 				<ModalStack.Screen name='NewMessageView' component={NewMessageView} />
-				<ModalStack.Screen name='SelectedUsersView' component={SelectedUsersView} />
 				<ModalStack.Screen name='CreateChannelView' component={CreateChannelView} />
 				{/* @ts-ignore */}
 				<ModalStack.Screen name='CreateDiscussionView' component={CreateDiscussionView} />

app/stacks/MasterDetailStack/types.ts

@@ -83,11 +83,12 @@ export type ModalStackParamList = {
 		showCloseModal?: boolean;
 	};
 	SelectedUsersView: {
-		maxUsers: number;
-		showButton: boolean;
-		title: string;
-		buttonText: string;
-		nextAction: Function;
+		maxUsers?: number;
+		showButton?: boolean;
+		title?: string;
+		buttonText?: string;
+		showSkipText?: boolean;
+		nextAction?: Function;
 	};
 	InviteUsersView: {
 		rid: string;
@@ -170,13 +171,6 @@ export type ModalStackParamList = {
 	DisplayPrefsView: undefined;
 	AdminPanelView: undefined;
 	NewMessageView: undefined;
-	SelectedUsersView: {
-		maxUsers: number;
-		showButton: boolean;
-		title: string;
-		buttonText: string;
-		nextAction: Function;
-	}; // TODO: Change
 	CreateChannelView: {
 		isTeam?: boolean; // TODO: To check
 		teamId?: string;

app/stacks/types.ts

@@ -247,6 +247,7 @@ export type NewMessageStackParamList = {
 		title?: string;
 		buttonText?: string;
 		nextAction?: Function;
+		showSkipText?: boolean;
 	}; // TODO: Change
 	CreateChannelView?: {
 		isTeam?: boolean; // TODO: To check

app/views/AccessibilityAndAppearanceView/index.tsx

@@ -116,7 +116,7 @@ const AccessibilityAndAppearanceView = () => {
 							setAlertDisplayType(value);
 						}}
 						title={I18n.t('A11y_appearance_show_alerts_as')}
-						value={alertDisplayType}
+						value={alertDisplayType || 'TOAST'}
 					/>
 					<List.Separator />
 				</List.Section>

app/views/SelectedUsersView/index.tsx

@@ -17,7 +17,8 @@ import database from '../../lib/database';
 import UserItem from '../../containers/UserItem';
 import { type ISelectedUser } from '../../reducers/selectedUsers';
 import { getUserSelector } from '../../selectors/login';
-import { type ChatsStackParamList } from '../../stacks/types';
+import { type ChatsStackParamList, type NewMessageStackParamList } from '../../stacks/types';
+import { type ModalStackParamList } from '../../stacks/MasterDetailStack/types';
 import { useTheme } from '../../theme';
 import { showErrorAlert } from '../../lib/methods/helpers/info';
 import log, { events, logEvent } from '../../lib/methods/helpers/log';
@@ -26,8 +27,11 @@ import { isGroupChat as isGroupChatMethod } from '../../lib/methods/helpers';
 import { useAppSelector } from '../../lib/hooks/useAppSelector';
 import Header from './Header';
 
-type TRoute = RouteProp<ChatsStackParamList, 'SelectedUsersView'>;
-type TNavigation = NativeStackNavigationProp<ChatsStackParamList, 'SelectedUsersView'>;
+type TRoute = RouteProp<ChatsStackParamList & NewMessageStackParamList & ModalStackParamList, 'SelectedUsersView'>;
+type TNavigation = NativeStackNavigationProp<
+	ChatsStackParamList & NewMessageStackParamList & ModalStackParamList,
+	'SelectedUsersView'
+>;
 
 const SelectedUsersView = () => {
 	const [chats, setChats] = useState<ISelectedUser[]>([]);