Skip to content

Removed isVisible prop from ValidateCodeForm #21594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hayata-suenaga merged 5 commits into from
Jul 18, 2023
Merged

Removed isVisible prop from ValidateCodeForm #21594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
300e0a0
Removed isVisible prop from ValidateCodeForm
huzaifa-99 Jun 26, 2023
39d2a9a
Fixed lint issues
huzaifa-99 Jun 26, 2023
dc624da
Focus magic input on first mount
huzaifa-99 Jun 30, 2023
68da6f4
Merge branch 'main' into 19787-remove-isVisible-prop-from-ValidateCod…
huzaifa-99 Jul 4, 2023
6db219f
Merge branch 'Expensify:main' into 19787-remove-isVisible-prop-from-V…
huzaifa-99 Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pages/signin/SignInPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ function SignInPage({credentials, account}) {
isVisible={shouldShowLoginForm}
blurOnSubmit={account.validated === false}
/>
{shouldShowValidateCodeForm ? <ValidateCodeForm isVisible={shouldShowValidateCodeForm} /> : <PasswordForm isVisible={shouldShowPasswordForm} />}
{shouldShowValidateCodeForm ? <ValidateCodeForm /> : <PasswordForm isVisible={shouldShowPasswordForm} />}
{shouldShowResendValidationForm && <ResendValidationForm />}
{shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
{shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
Expand Down
23 changes: 2 additions & 21 deletions src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import ChangeExpensifyLoginLink from '../ChangeExpensifyLoginLink';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import compose from '../../../libs/compose';
import * as ValidationUtils from '../../../libs/ValidationUtils';
import withToggleVisibilityView, {toggleVisibilityViewPropTypes} from '../../../components/withToggleVisibilityView';
import canFocusInputOnScreenFocus from '../../../libs/canFocusInputOnScreenFocus';
import * as ErrorUtils from '../../../libs/ErrorUtils';
import {withNetwork} from '../../../components/OnyxProvider';
Expand Down Expand Up @@ -62,7 +61,6 @@ const propTypes = {
autoComplete: PropTypes.oneOf(['sms-otp', 'one-time-code']).isRequired,

...withLocalizePropTypes,
...toggleVisibilityViewPropTypes,
};

const defaultProps = {
Expand All @@ -80,7 +78,6 @@ function BaseValidateCodeForm(props) {
const [twoFactorAuthCode, setTwoFactorAuthCode] = useState('');
const [timeRemaining, setTimeRemaining] = useState(30);

const prevIsVisible = usePrevious(props.isVisible);
const prevRequiresTwoFactorAuth = usePrevious(props.account.requiresTwoFactorAuth);
const prevValidateCode = usePrevious(props.credentials.validateCode);

Expand All @@ -98,26 +95,11 @@ function BaseValidateCodeForm(props) {
}, [props.account.isLoading, props.session.autoAuthState, hasError]);

useEffect(() => {
if (!inputValidateCodeRef.current || prevIsVisible || !props.isVisible || !canFocusInputOnScreenFocus()) {
if (!inputValidateCodeRef.current || !canFocusInputOnScreenFocus()) {
return;
}
inputValidateCodeRef.current.focus();
}, [props.isVisible, prevIsVisible]);

useEffect(() => {
if (!inputValidateCodeRef.current) {
return;
}

if (!validateCode) {
return;
}

// Clear the code input if magic code valid
if (prevIsVisible && !props.isVisible) {
setValidateCode('');
}
}, [props.isVisible, prevIsVisible, validateCode]);
}, []);
Comment thread
hayata-suenaga marked this conversation as resolved.

useEffect(() => {
if (prevValidateCode || !props.credentials.validateCode) {
Expand Down Expand Up @@ -329,6 +311,5 @@ export default compose(
preferredLocale: {key: ONYXKEYS.NVP_PREFERRED_LOCALE},
session: {key: ONYXKEYS.SESSION},
}),
withToggleVisibilityView,
withNetwork(),
)(BaseValidateCodeForm);
18 changes: 4 additions & 14 deletions src/pages/signin/ValidateCodeForm/index.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
import React from 'react';
import PropTypes from 'prop-types';
import BaseValidateCodeForm from './BaseValidateCodeForm';

const defaultProps = {
isVisible: false,
};
const defaultProps = {};

const propTypes = {
isVisible: PropTypes.bool,
};
function ValidateCodeForm(props) {
return (
<BaseValidateCodeForm
isVisible={props.isVisible}
autoComplete="sms-otp"
/>
);
const propTypes = {};
function ValidateCodeForm() {
return <BaseValidateCodeForm autoComplete="sms-otp" />;
}

ValidateCodeForm.displayName = 'ValidateCodeForm';
Expand Down
18 changes: 4 additions & 14 deletions src/pages/signin/ValidateCodeForm/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
import React from 'react';
import PropTypes from 'prop-types';
import BaseValidateCodeForm from './BaseValidateCodeForm';

const defaultProps = {
isVisible: false,
};
const defaultProps = {};

const propTypes = {
isVisible: PropTypes.bool,
};
function ValidateCodeForm(props) {
return (
<BaseValidateCodeForm
isVisible={props.isVisible}
autoComplete="one-time-code"
/>
);
const propTypes = {};
function ValidateCodeForm() {
return <BaseValidateCodeForm autoComplete="one-time-code" />;
}

ValidateCodeForm.displayName = 'ValidateCodeForm';
Expand Down