diff --git a/app/actions/remote/entry/common.ts b/app/actions/remote/entry/common.ts index dff04e578..3ff5d0201 100644 --- a/app/actions/remote/entry/common.ts +++ b/app/actions/remote/entry/common.ts @@ -406,6 +406,7 @@ export async function verifyPushProxy(serverUrl: string) { } } +// LOL export async function handleEntryAfterLoadNavigation( serverUrl: string, teamMembers: TeamMembership[], diff --git a/app/actions/remote/entry/gql_common.ts b/app/actions/remote/entry/gql_common.ts index acecb84d0..9b1b8d79f 100644 --- a/app/actions/remote/entry/gql_common.ts +++ b/app/actions/remote/entry/gql_common.ts @@ -266,6 +266,7 @@ export const entryGQL = async (serverUrl: string, currentTeamId?: string, curren return {models, initialTeamId, initialChannelId, prefData, teamData, chData, meData}; }; +// LOL export const entry = async (serverUrl: string, teamId?: string, channelId?: string, since = 0): Promise => { const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl); const config = await getConfig(database); diff --git a/app/constants/screens.ts b/app/constants/screens.ts index 358bdf236..c288f7671 100644 --- a/app/constants/screens.ts +++ b/app/constants/screens.ts @@ -70,6 +70,7 @@ export const THREAD = 'Thread'; export const THREAD_FOLLOW_BUTTON = 'ThreadFollowButton'; export const THREAD_OPTIONS = 'ThreadOptions'; export const USER_PROFILE = 'UserProfile'; +export const CONVERT_GM_TO_CHANNEL = 'ConvertGMToChannel'; export default { ABOUT, @@ -141,6 +142,7 @@ export default { THREAD_FOLLOW_BUTTON, THREAD_OPTIONS, USER_PROFILE, + CONVERT_GM_TO_CHANNEL, } as const; export const MODAL_SCREENS_WITHOUT_BACK = new Set([ diff --git a/app/screens/channel_info/channel_info.tsx b/app/screens/channel_info/channel_info.tsx index 3cd0239f1..237189771 100644 --- a/app/screens/channel_info/channel_info.tsx +++ b/app/screens/channel_info/channel_info.tsx @@ -5,6 +5,8 @@ import React, {useCallback} from 'react'; import {ScrollView, View} from 'react-native'; import {type Edge, SafeAreaView} from 'react-native-safe-area-context'; +import ConvertToChannelLabel from '@app/components/channel_actions/convert_to_channel/convert_to_channel_label'; +import {General} from '@app/constants'; import ChannelInfoEnableCalls from '@calls/components/channel_info_enable_calls'; import ChannelActions from '@components/channel_actions'; import {useServerUrl} from '@context/server'; @@ -21,8 +23,6 @@ import Options from './options'; import Title from './title'; import type {AvailableScreens} from '@typings/screens/navigation'; -import ConvertToChannelLabel from '@app/components/channel_actions/convert_to_channel/convert_to_channel_label'; -import { General } from '@app/constants'; type Props = { channelId: string; diff --git a/app/screens/index.tsx b/app/screens/index.tsx index 47059b289..4e46ee838 100644 --- a/app/screens/index.tsx +++ b/app/screens/index.tsx @@ -262,6 +262,8 @@ Navigation.setLazyComponentRegistrator((screenName) => { case Screens.CALL: screen = withServerDatabase(require('@calls/screens/call_screen').default); break; + case Screens.CONVERT_GM_TO_CHANNEL: + screen = withServerDatabase(require('@screens/convert_gm_to_channel').default); } if (screen) { diff --git a/app/screens/navigation.ts b/app/screens/navigation.ts index b1f02203a..8fde51685 100644 --- a/app/screens/navigation.ts +++ b/app/screens/navigation.ts @@ -245,6 +245,7 @@ export function getThemeFromState(): Theme { function isScreenRegistered(screen: AvailableScreens) { const notImplemented = NOT_READY.includes(screen) || !Object.values(Screens).includes(screen); if (notImplemented) { + console.log('AAAA'); Alert.alert( 'Temporary error ' + screen, 'The functionality you are trying to use has not been implemented yet',