Skip to content

Commit fb51d9e

Browse files
authored
Merge pull request #59697 from bernhardoj/fix/58954-dupe-settings-screen
Fix needs to press back twice after opening a workspace join page
2 parents cb0a963 + 58d9a6c commit fb51d9e

File tree

3 files changed

+1
-28
lines changed

3 files changed

+1
-28
lines changed

src/libs/navigateAfterJoinRequest/index.web.ts renamed to src/libs/navigateAfterJoinRequest.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
import getIsSmallScreenWidth from '@libs/getIsSmallScreenWidth';
2-
import Navigation from '@navigation/Navigation';
31
import ROUTES from '@src/ROUTES';
2+
import Navigation from './Navigation/Navigation';
43

54
const navigateAfterJoinRequest = () => {
65
Navigation.goBack(undefined, {shouldPopToTop: true});
7-
if (getIsSmallScreenWidth()) {
8-
Navigation.setNavigationActionToMicrotaskQueue(() => {
9-
Navigation.navigate(ROUTES.SETTINGS);
10-
});
11-
}
126
Navigation.setNavigationActionToMicrotaskQueue(() => {
137
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route);
148
});

src/libs/navigateAfterJoinRequest/index.desktop.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/libs/navigateAfterJoinRequest/index.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)