Page MenuHomePhabricator
Files F3354240

D12181.id40693.diff
No OneTemporary
Actions

D12181.id40693.diff
View Options

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
@@ -66,10 +66,7 @@
runTiming,
ratchetAlongWithKeyboardHeight,
} from '../utils/animation-utils.js';
-import {
- type StateContainer,
- type StateChange,
-} from '../utils/state-container.js';
+import type { StateContainer } from '../utils/state-container.js';
import EthereumLogo from '../vectors/ethereum-logo.react.js';
let initialAppLoad = true;
@@ -233,6 +230,8 @@
...BaseProps,
+logInStateContainer: StateContainer<LogInState>,
+legacyRegisterStateContainer: StateContainer<LegacyRegisterState>,
+ +mode: Mode,
+ +setMode: (Partial<Mode>) => void,
// Navigation state
+isForeground: boolean,
// Redux state
@@ -246,15 +245,10 @@
// Redux dispatch functions
+dispatch: Dispatch,
};
-type State = {
- +mode: LoggedOutMode,
- +nextMode: LoggedOutMode,
-};
-class LoggedOutModal extends React.PureComponent<Props, State> {
+class LoggedOutModal extends React.PureComponent<Props> {
keyboardShowListener: ?EventSubscription;
keyboardHideListener: ?EventSubscription;
- mounted = false;
nextMode: LoggedOutMode = 'loading';
activeAlert = false;
@@ -269,12 +263,7 @@
constructor(props: Props) {
super(props);
- const initialMode = props.persistedStateLoaded ? 'prompt' : 'loading';
- this.state = {
- mode: initialMode,
- nextMode: initialMode,
- };
- this.nextMode = initialMode;
+ this.nextMode = props.mode.curMode;
this.contentHeight = new Value(props.dimensions.safeAreaHeight);
this.modeValue = new Value(modeNumbers[this.nextMode]);
@@ -284,24 +273,17 @@
this.panelOpacityValue = this.panelOpacity();
}
- guardedSetState = (change: StateChange<State>, callback?: () => mixed) => {
- if (this.mounted) {
- this.setState(change, callback);
- }
- };
-
setMode(newMode: LoggedOutMode) {
this.nextMode = newMode;
- this.guardedSetState({ mode: newMode, nextMode: newMode });
+ this.props.setMode({ curMode: newMode, nextMode: newMode });
this.modeValue.setValue(modeNumbers[newMode]);
}
proceedToNextMode = () => {
- this.guardedSetState({ mode: this.nextMode });
+ this.props.setMode({ curMode: this.nextMode });
};
componentDidMount() {
- this.mounted = true;
if (this.props.rehydrateConcluded) {
this.onInitialAppLoad();
}
@@ -311,13 +293,12 @@
}
componentWillUnmount() {
- this.mounted = false;
if (this.props.isForeground) {
this.onBackground();
}
}
- componentDidUpdate(prevProps: Props, prevState: State) {
+ componentDidUpdate(prevProps: Props) {
if (!prevProps.persistedStateLoaded && this.props.persistedStateLoaded) {
this.setMode('prompt');
}
@@ -330,7 +311,10 @@
this.onBackground();
}
- if (this.state.mode === 'prompt' && prevState.mode !== 'prompt') {
+ if (
+ this.props.mode.curMode === 'prompt' &&
+ prevProps.mode.curMode !== 'prompt'
+ ) {
this.buttonOpacity.setValue(0);
Animated.timing(this.buttonOpacity, {
easing: EasingNode.out(EasingNode.ease),
@@ -533,7 +517,7 @@
goBackToPrompt = () => {
this.nextMode = 'prompt';
- this.guardedSetState({ nextMode: 'prompt' });
+ this.props.setMode({ nextMode: 'prompt' });
this.keyboardHeightValue.setValue(0);
this.modeValue.setValue(modeNumbers['prompt']);
Keyboard.dismiss();
@@ -566,7 +550,7 @@
let panel = null;
let buttons = null;
- if (this.state.mode === 'log-in') {
+ if (this.props.mode.curMode === 'log-in') {
panel = (
<LogInPanel
setActiveAlert={this.setActiveAlert}
@@ -574,7 +558,7 @@
logInState={this.props.logInStateContainer}
/>
);
- } else if (this.state.mode === 'register') {
+ } else if (this.props.mode.curMode === 'register') {
panel = (
<LegacyRegisterPanel
setActiveAlert={this.setActiveAlert}
@@ -582,7 +566,7 @@
legacyRegisterState={this.props.legacyRegisterStateContainer}
/>
);
- } else if (this.state.mode === 'prompt') {
+ } else if (this.props.mode.curMode === 'prompt') {
const opacityStyle = { opacity: this.buttonOpacity };
const registerButtons = [];
@@ -649,7 +633,7 @@
<View style={styles.registerButtons}>{registerButtons}</View>
</Animated.View>
);
- } else if (this.state.mode === 'loading') {
+ } else if (this.props.mode.curMode === 'loading') {
panel = (
<ActivityIndicator
color="white"
@@ -681,11 +665,11 @@
);
let siwePanel;
- if (this.state.mode === 'siwe') {
+ if (this.props.mode.curMode === 'siwe') {
siwePanel = (
<FullscreenSIWEPanel
goBackToPrompt={this.goBackToPrompt}
- closing={this.state.nextMode === 'prompt'}
+ closing={this.props.mode.nextMode === 'prompt'}
/>
);
}
@@ -757,6 +741,11 @@
confirmPasswordInputText: '',
};
+type Mode = {
+ +curMode: LoggedOutMode,
+ +nextMode: LoggedOutMode,
+};
+
const ConnectedLoggedOutModal: React.ComponentType<BaseProps> =
React.memo<BaseProps>(function ConnectedLoggedOutModal(props: BaseProps) {
const mountedRef = React.useRef(false);
@@ -811,13 +800,28 @@
[legacyRegisterState, setLegacyRegisterState],
);
+ const persistedStateLoaded = usePersistedStateLoaded();
+ const initialMode = persistedStateLoaded ? 'prompt' : 'loading';
+ const [mode, baseSetMode] = React.useState(() => ({
+ curMode: initialMode,
+ nextMode: initialMode,
+ }));
+ const setMode = React.useCallback((newMode: Partial<Mode>) => {
+ if (!mountedRef.current) {
+ return;
+ }
+ baseSetMode(prevMode => ({
+ ...prevMode,
+ ...newMode,
+ }));
+ }, []);
+
const navContext = React.useContext(NavContext);
const isForeground = isForegroundSelector(navContext);
const rehydrateConcluded = useSelector(
state => !!(state._persist && state._persist.rehydrated && navContext),
);
- const persistedStateLoaded = usePersistedStateLoaded();
const cookie = useSelector(cookieSelector(authoritativeKeyserverID));
const loggedIn = useSelector(isLoggedIn);
const dimensions = useSelector(derivedDimensionsInfoSelector);
@@ -830,6 +834,8 @@
{...props}
logInStateContainer={logInStateContainer}
legacyRegisterStateContainer={legacyRegisterStateContainer}
+ mode={mode}
+ setMode={setMode}
isForeground={isForeground}
persistedStateLoaded={persistedStateLoaded}
rehydrateConcluded={rehydrateConcluded}
diff --git a/native/utils/state-container.js b/native/utils/state-container.js
--- a/native/utils/state-container.js
+++ b/native/utils/state-container.js
@@ -5,8 +5,6 @@
callback?: () => mixed,
) => void;
-export type StateChange<S: { ... }> = Partial<S> | (S => Partial<S>);
-
export type StateContainer<S: { ... }> = {
state: S,
setState: SimpleStateSetter<S>,

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 12:30 PM (19 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2575060
Default Alt Text
D12181.id40693.diff (7 KB)

Event Timeline