@@ -21,6 +21,7 @@ import useStyleUtils from '@hooks/useStyleUtils';
2121import useTheme from '@hooks/useTheme' ;
2222import useThemeStyles from '@hooks/useThemeStyles' ;
2323import DateUtils from '@libs/DateUtils' ;
24+ import focusAfterModalClose from '@libs/focusAfterModalClose' ;
2425import Navigation from '@libs/Navigation/Navigation' ;
2526import { clearCustomStatus , clearDraftCustomStatus , updateCustomStatus , updateDraftCustomStatus } from '@userActions/User' ;
2627import CONST from '@src/CONST' ;
@@ -36,7 +37,7 @@ function StatusPage() {
3637 const styles = useThemeStyles ( ) ;
3738 const StyleUtils = useStyleUtils ( ) ;
3839 const { translate} = useLocalize ( ) ;
39- const [ draftStatus ] = useOnyx ( ONYXKEYS . CUSTOM_STATUS_DRAFT ) ;
40+ const [ draftStatus ] = useOnyx ( ONYXKEYS . CUSTOM_STATUS_DRAFT , { canBeMissing : true } ) ;
4041 const currentUserPersonalDetails = useCurrentUserPersonalDetails ( ) ;
4142 const formRef = useRef < FormRef > ( null ) ;
4243 const [ brickRoadIndicator , setBrickRoadIndicator ] = useState < ValueOf < typeof CONST . BRICK_ROAD_INDICATOR_STATUS > > ( ) ;
@@ -197,9 +198,7 @@ function StatusPage() {
197198 role = { CONST . ROLE . PRESENTATION }
198199 defaultValue = { defaultEmoji }
199200 style = { styles . mb3 }
200- onModalHide = { ( ) => {
201- inputRef . current ?. focus ( ) ;
202- } }
201+ onModalHide = { ( ) => focusAfterModalClose ( inputRef . current ) }
203202 // eslint-disable-next-line @typescript-eslint/no-unused-vars
204203 onInputChange = { ( emoji : string ) : void => { } }
205204 />
0 commit comments