Unverified Commit 09843aa5 authored by Gung Wah's avatar Gung Wah Committed by GitHub
Browse files

[FIX] App not sending second argument for EventEmitter.removeListener on some places (#2909)


Co-authored-by: default avatarDiego Mello <diegolmello@gmail.com>
parent 3a950547
......@@ -28,7 +28,7 @@ class Toast extends React.Component {
}
componentDidMount() {
EventEmitter.addEventListener(LISTENER, this.showToast);
this.listener = EventEmitter.addEventListener(LISTENER, this.showToast);
}
shouldComponentUpdate(nextProps) {
......@@ -40,7 +40,7 @@ class Toast extends React.Component {
}
componentWillUnmount() {
EventEmitter.removeListener(LISTENER);
EventEmitter.removeListener(LISTENER, this.listener);
}
getToastRef = toast => this.toast = toast;
......
......@@ -58,9 +58,9 @@ const TwoFactor = React.memo(({ theme, isMasterDetail }) => {
const showTwoFactor = args => setData(args);
useEffect(() => {
EventEmitter.addEventListener(TWO_FACTOR, showTwoFactor);
const listener = EventEmitter.addEventListener(TWO_FACTOR, showTwoFactor);
return () => EventEmitter.removeListener(TWO_FACTOR);
return () => EventEmitter.removeListener(TWO_FACTOR, listener);
}, []);
const onCancel = () => {
......
......@@ -63,12 +63,12 @@ const ChangePasscodeView = React.memo(({ theme }) => {
if (!isTablet) {
Orientation.lockToPortrait();
}
EventEmitter.addEventListener(CHANGE_PASSCODE_EMITTER, showChangePasscode);
const listener = EventEmitter.addEventListener(CHANGE_PASSCODE_EMITTER, showChangePasscode);
return (() => {
if (!isTablet) {
Orientation.unlockAllOrientations();
}
EventEmitter.removeListener(CHANGE_PASSCODE_EMITTER);
EventEmitter.removeListener(CHANGE_PASSCODE_EMITTER, listener);
});
}, []);
......
......@@ -31,12 +31,12 @@ const ScreenLockedView = ({ theme }) => {
if (!isTablet) {
Orientation.lockToPortrait();
}
EventEmitter.addEventListener(LOCAL_AUTHENTICATE_EMITTER, showScreenLock);
const listener = EventEmitter.addEventListener(LOCAL_AUTHENTICATE_EMITTER, showScreenLock);
return (() => {
if (!isTablet) {
Orientation.unlockAllOrientations();
}
EventEmitter.removeListener(LOCAL_AUTHENTICATE_EMITTER);
EventEmitter.removeListener(LOCAL_AUTHENTICATE_EMITTER, listener);
});
}, []);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment