Page MenuHomePhabricator
Files F3353674

D12184.diff
No OneTemporary
Actions

D12184.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
@@ -232,14 +232,14 @@
+logInStateContainer: StateContainer<LogInState>,
+legacyRegisterStateContainer: StateContainer<LegacyRegisterState>,
+mode: Mode,
- +setMode: (Partial<Mode>) => void,
+nextModeRef: { current: LoggedOutMode },
+contentHeight: Value,
+keyboardHeightValue: Value,
- +modeValue: Value,
+buttonOpacity: Value,
+panelPaddingTop: Node,
+panelOpacity: Node,
+ +combinedSetMode: LoggedOutMode => void,
+ +goBackToPrompt: () => void,
// Navigation state
+isForeground: boolean,
// Redux state
@@ -259,12 +259,6 @@
activeAlert = false;
- setMode(newMode: LoggedOutMode) {
- this.props.nextModeRef.current = newMode;
- this.props.setMode({ curMode: newMode, nextMode: newMode });
- this.props.modeValue.setValue(modeNumbers[newMode]);
- }
-
componentDidMount() {
if (this.props.rehydrateConcluded) {
this.onInitialAppLoad();
@@ -282,7 +276,7 @@
componentDidUpdate(prevProps: Props) {
if (!prevProps.persistedStateLoaded && this.props.persistedStateLoaded) {
- this.setMode('prompt');
+ this.props.combinedSetMode('prompt');
}
if (!prevProps.rehydrateConcluded && this.props.rehydrateConcluded) {
this.onInitialAppLoad();
@@ -362,7 +356,7 @@
hardwareBack: () => boolean = () => {
if (this.props.nextModeRef.current !== 'prompt') {
- this.goBackToPrompt();
+ this.props.goBackToPrompt();
return true;
}
return false;
@@ -396,14 +390,6 @@
this.activeAlert = activeAlert;
};
- goBackToPrompt = () => {
- this.props.nextModeRef.current = 'prompt';
- this.props.setMode({ nextMode: 'prompt' });
- this.props.keyboardHeightValue.setValue(0);
- this.props.modeValue.setValue(modeNumbers['prompt']);
- Keyboard.dismiss();
- };
-
render(): React.Node {
const { styles } = this.props;
@@ -549,7 +535,7 @@
if (this.props.mode.curMode === 'siwe') {
siwePanel = (
<FullscreenSIWEPanel
- goBackToPrompt={this.goBackToPrompt}
+ goBackToPrompt={this.props.goBackToPrompt}
closing={this.props.mode.nextMode === 'prompt'}
/>
);
@@ -575,7 +561,7 @@
}
onPressSIWE = () => {
- this.setMode('siwe');
+ this.props.combinedSetMode('siwe');
};
onPressLogIn = () => {
@@ -591,7 +577,7 @@
// behavior on iOS.
this.props.keyboardHeightValue.setValue(-1);
}
- this.setMode('log-in');
+ this.props.combinedSetMode('log-in');
};
onPressQRCodeSignIn = () => {
@@ -600,7 +586,7 @@
onPressRegister = () => {
this.props.keyboardHeightValue.setValue(-1);
- this.setMode('register');
+ this.props.combinedSetMode('register');
};
onPressNewRegister = () => {
@@ -812,6 +798,23 @@
]);
}, [modeValue, keyboardHeightValue, proceedToNextMode]);
+ const combinedSetMode = React.useCallback(
+ (newMode: LoggedOutMode) => {
+ nextModeRef.current = newMode;
+ setMode({ curMode: newMode, nextMode: newMode });
+ modeValue.setValue(modeNumbers[newMode]);
+ },
+ [setMode, modeValue],
+ );
+
+ const goBackToPrompt = React.useCallback(() => {
+ nextModeRef.current = 'prompt';
+ setMode({ nextMode: 'prompt' });
+ keyboardHeightValue.setValue(0);
+ modeValue.setValue(modeNumbers['prompt']);
+ Keyboard.dismiss();
+ }, [setMode, keyboardHeightValue, modeValue]);
+
const navContext = React.useContext(NavContext);
const isForeground = isForegroundSelector(navContext);
@@ -830,14 +833,14 @@
logInStateContainer={logInStateContainer}
legacyRegisterStateContainer={legacyRegisterStateContainer}
mode={mode}
- setMode={setMode}
nextModeRef={nextModeRef}
contentHeight={contentHeight}
keyboardHeightValue={keyboardHeightValue}
- modeValue={modeValue}
buttonOpacity={buttonOpacity}
panelPaddingTop={panelPaddingTop}
panelOpacity={panelOpacity}
+ combinedSetMode={combinedSetMode}
+ goBackToPrompt={goBackToPrompt}
isForeground={isForeground}
persistedStateLoaded={persistedStateLoaded}
rehydrateConcluded={rehydrateConcluded}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 10:51 AM (21 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2575075
Default Alt Text
D12184.diff (4 KB)

Event Timeline