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

Fix ESC key doesn't close debug modal #50280

Merged
merged 3 commits into from
Oct 28, 2024
Merged

Fix ESC key doesn't close debug modal #50280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7109d2f
fix can't close debug modal when open it with another modal is showing
bernhardoj Oct 5, 2024
ccffbb6
move debug modal to authscreens
bernhardoj Oct 5, 2024
641c2a0
Merge branch 'main' into fix/49802-esc-key-doesnt-close-debug-modal
bernhardoj Oct 24, 2024
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
2 changes: 0 additions & 2 deletions src/components/ScreenWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import ImportedStateIndicator from './ImportedStateIndicator';
import KeyboardAvoidingView from './KeyboardAvoidingView';
import OfflineIndicator from './OfflineIndicator';
import SafeAreaConsumer from './SafeAreaConsumer';
import TestToolsModal from './TestToolsModal';
import withNavigationFallback from './withNavigationFallback';

type ScreenWrapperChildrenProps = {
Expand Down Expand Up @@ -276,7 +275,6 @@ function ScreenWrapper(
enabled={shouldEnablePickerAvoiding}
>
<HeaderGap styles={headerGapStyles} />
<TestToolsModal />
{isDevelopment && <CustomDevMenu />}
<ScreenWrapperStatusContext.Provider value={contextValue}>
{
Expand Down
6 changes: 3 additions & 3 deletions src/libs/Navigation/AppNavigator/AuthScreens.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import OptionsListContextProvider from '@components/OptionListContextProvider';
import {SearchContextProvider} from '@components/Search/SearchContext';
import {useSearchRouterContext} from '@components/Search/SearchRouter/SearchRouterContext';
import SearchRouterModal from '@components/Search/SearchRouter/SearchRouterModal';
import TestToolsModal from '@components/TestToolsModal';
import useActiveWorkspace from '@hooks/useActiveWorkspace';
import useOnboardingFlowRouter from '@hooks/useOnboardingFlow';
import usePermissions from '@hooks/usePermissions';
Expand Down Expand Up @@ -378,9 +379,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie

const unsubscribeDebugShortcut = KeyboardShortcut.subscribe(
debugShortcutConfig.shortcutKey,
() => {
toggleTestToolsModal();
},
() => Modal.close(toggleTestToolsModal),
debugShortcutConfig.descriptionKey,
debugShortcutConfig.modifiers,
true,
Expand Down Expand Up @@ -578,6 +577,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
);
})}
</RootStack.Navigator>
<TestToolsModal />
<SearchRouterModal />
</View>
{didPusherInit && <ActiveGuidesEventListener />}
Expand Down
Loading