@@ -41,6 +41,7 @@ import type {SettingsSplitNavigatorParamList} from '@libs/Navigation/types';
41
41
import { getPolicy , getPolicyBrickRoadIndicatorStatus , getWorkspaceAccountID , isPolicyAdmin , shouldShowPolicy } from '@libs/PolicyUtils' ;
42
42
import { getDefaultWorkspaceAvatar } from '@libs/ReportUtils' ;
43
43
import type { AvatarSource } from '@libs/UserUtils' ;
44
+ import useHandleBackButton from '@pages/Search/useHandleBackButton' ;
44
45
import CONST from '@src/CONST' ;
45
46
import ONYXKEYS from '@src/ONYXKEYS' ;
46
47
import ROUTES from '@src/ROUTES' ;
@@ -434,6 +435,13 @@ function WorkspacesListPage() {
434
435
/>
435
436
) ;
436
437
438
+ const onBackButtonPress = ( ) => {
439
+ Navigation . goBack ( route . params ?. backTo ?? ROUTES . SETTINGS ) ;
440
+ return true ;
441
+ } ;
442
+
443
+ useHandleBackButton ( onBackButtonPress ) ;
444
+
437
445
if ( isEmptyObject ( workspaces ) ) {
438
446
return (
439
447
< ScreenWrapper
@@ -447,7 +455,7 @@ function WorkspacesListPage() {
447
455
title = { translate ( 'common.workspaces' ) }
448
456
shouldShowBackButton = { shouldUseNarrowLayout }
449
457
shouldDisplaySearchRouter
450
- onBackButtonPress = { ( ) => Navigation . goBack ( route . params ?. backTo ?? ROUTES . SETTINGS ) }
458
+ onBackButtonPress = { onBackButtonPress }
451
459
icon = { Illustrations . Buildings }
452
460
shouldUseHeadlineHeader
453
461
/>
@@ -487,7 +495,7 @@ function WorkspacesListPage() {
487
495
title = { translate ( 'common.workspaces' ) }
488
496
shouldShowBackButton = { shouldUseNarrowLayout }
489
497
shouldDisplaySearchRouter
490
- onBackButtonPress = { ( ) => Navigation . goBack ( route . params ?. backTo ?? ROUTES . SETTINGS ) }
498
+ onBackButtonPress = { onBackButtonPress }
491
499
icon = { Illustrations . Buildings }
492
500
shouldUseHeadlineHeader
493
501
>
0 commit comments