Page MenuHomePhorge
Files F33205633

D3218.1768547367.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D3218.1768547367.diff
View Options

diff --git a/web/modals/account/log-in-modal.react.js b/web/modals/account/log-in-modal.react.js
--- a/web/modals/account/log-in-modal.react.js
+++ b/web/modals/account/log-in-modal.react.js
@@ -25,6 +25,7 @@
import { useSelector } from '../../redux/redux-utils';
import { webLogInExtraInfoSelector } from '../../selectors/account-selectors';
import Input from '../input.react';
+import { ModalContext } from '../modal-provider.react';
import Modal from '../modal.react';
import css from './user-settings-modal.css';
@@ -37,6 +38,7 @@
+logInExtraInfo: () => LogInExtraInfo,
+dispatchActionPromise: DispatchActionPromise,
+logIn: (logInInfo: LogInInfo) => Promise<LogInResult>,
+ +clearModal: () => void,
};
type State = {
+username: string,
@@ -63,7 +65,7 @@
render() {
return (
- <Modal name="Log in" onClose={this.clearModal}>
+ <Modal name="Log in" onClose={this.props.clearModal}>
<div className={css['modal-body']}>
<form method="POST">
<div>
@@ -175,7 +177,7 @@
password: this.state.password,
...extraInfo,
});
- this.clearModal();
+ this.props.clearModal();
return result;
} catch (e) {
if (e.message === 'invalid_parameters') {
@@ -216,10 +218,6 @@
throw e;
}
}
-
- clearModal = () => {
- this.props.setModal(null);
- };
}
const loadingStatusSelector = createLoadingStatusSelector(logInActionTypes);
@@ -231,6 +229,8 @@
const callLogIn = useServerCall(logIn);
const dispatchActionPromise = useDispatchActionPromise();
+ const modalContext = React.useContext(ModalContext);
+ invariant(modalContext, 'modalContext unset');
return (
<LogInModal
{...props}
@@ -238,6 +238,7 @@
logInExtraInfo={loginExtraInfo}
logIn={callLogIn}
dispatchActionPromise={dispatchActionPromise}
+ clearModal={modalContext.clearModal}
/>
);
},

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 16, 7:09 AM (14 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5942642
Default Alt Text
D3218.1768547367.diff (1 KB)

Event Timeline