diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js --- a/native/account/logged-out-modal.react.js +++ b/native/account/logged-out-modal.react.js @@ -348,9 +348,12 @@ if (!isForeground) { return undefined; } - BackHandler.addEventListener('hardwareBackPress', resetToPrompt); + const backHandlerSubscription = BackHandler.addEventListener( + 'hardwareBackPress', + resetToPrompt, + ); return () => { - BackHandler.removeEventListener('hardwareBackPress', resetToPrompt); + backHandlerSubscription.remove(); }; }, [isForeground, resetToPrompt]); diff --git a/native/account/terms-and-privacy-modal.react.js b/native/account/terms-and-privacy-modal.react.js --- a/native/account/terms-and-privacy-modal.react.js +++ b/native/account/terms-and-privacy-modal.react.js @@ -85,9 +85,12 @@ const onBackPress = props.navigation.isFocused; React.useEffect(() => { - BackHandler.addEventListener('hardwareBackPress', onBackPress); + const backHandlerSubscription = BackHandler.addEventListener( + 'hardwareBackPress', + onBackPress, + ); return () => { - BackHandler.removeEventListener('hardwareBackPress', onBackPress); + backHandlerSubscription.remove(); }; }, [onBackPress]); diff --git a/native/chat/chat-thread-list.react.js b/native/chat/chat-thread-list.react.js --- a/native/chat/chat-thread-list.react.js +++ b/native/chat/chat-thread-list.react.js @@ -484,9 +484,12 @@ }, [navigation, onTabPress]); React.useEffect(() => { - BackHandler.addEventListener('hardwareBackPress', hardwareBack); + const backHandlerSubscription = BackHandler.addEventListener( + 'hardwareBackPress', + hardwareBack, + ); return () => { - BackHandler.removeEventListener('hardwareBackPress', hardwareBack); + backHandlerSubscription.remove(); }; }, [hardwareBack]);