Skip to content

fix "Android - Keyboard doesn't open automatically while verifying contact method #22164

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
techievivek merged 2 commits into from
Jul 6, 2023
Merged

fix "Android - Keyboard doesn't open automatically while verifying contact method #22164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca4fcaf
fix "Android - Keyboard doesn't open automatically while verifying co…
situchan Jul 4, 2023
4115925
Merge branch 'main' of https://github.com/situchan/Expensify into fix…
situchan Jul 5, 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
10 changes: 6 additions & 4 deletions src/components/MagicCodeInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,19 @@ function MagicCodeInput(props) {
let focusTimeout = null;
if (props.shouldDelayFocus) {
focusTimeout = setTimeout(() => inputRefs.current[0].focus(), CONST.ANIMATED_TRANSITION);
} else {
inputRefs.current[0].focus();
}

inputRefs.current[0].focus();

return () => {
if (!focusTimeout) {
return;
}
clearTimeout(focusTimeout);
};
}, [props.autoFocus, props.shouldDelayFocus]);
// We only want this to run on mount
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
Comment on lines +172 to +174

@allroundexperts allroundexperts Jul 5, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if we keep those props?

@situchan situchan Jul 5, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is aligned with BaseTextInput.
No issue with original dependencies but no need, as auto-focus should happen only on component mount.

@allroundexperts allroundexperts Jul 5, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. Can you also upload screen recordings of the magic code input on the login page working as expected?

@situchan situchan Jul 5, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Note: mSafari login magic code auto-focus doesn't work on main

@allroundexperts allroundexperts Jul 5, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@situchan It's working on Staging.

Screen.Recording.2023-07-05.at.3.08.34.PM.mov

@situchan situchan Jul 5, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not working for me. Tested on iOS 16.4. Might depend on iOS version.

Screen.Recording.2023-07-05.at.11.20.17.AM.mov

It would be great if you can test this branch on your simulator.
As shouldDelayFocus is not passed to MagicCodeInput on sign in page, it should not be affected by this PR.

@allroundexperts allroundexperts Jul 5, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it has do with the iOS version. Just tested locally and it works!

@allroundexperts allroundexperts Jul 5, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proof:
https://github.com/Expensify/App/assets/30054992/7720196c-a696-454f-8e73-a5b1a795ce7a


/**
* Focuses on the input when it is pressed.
Expand Down Expand Up @@ -322,7 +324,7 @@ function MagicCodeInput(props) {
<View style={[StyleSheet.absoluteFillObject, styles.w100, isMobileSafari ? styles.bgTransparent : styles.opacity0]}>
<TextInput
ref={(ref) => (inputRefs.current[index] = ref)}
autoFocus={index === 0 && props.autoFocus}
autoFocus={index === 0 && props.autoFocus && !props.shouldDelayFocus}
inputMode="numeric"
textContentType="oneTimeCode"
name={props.name}
Expand Down
2 changes: 2 additions & 0 deletions src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import * as User from '../../../../../libs/actions/User';
import Button from '../../../../../components/Button';
import DotIndicatorMessage from '../../../../../components/DotIndicatorMessage';
import * as Session from '../../../../../libs/actions/Session';
import shouldDelayFocus from '../../../../../libs/shouldDelayFocus';
import Text from '../../../../../components/Text';
import {withNetwork} from '../../../../../components/OnyxProvider';
import PressableWithFeedback from '../../../../../components/Pressable/PressableWithFeedback';
Expand Down Expand Up @@ -135,6 +136,7 @@ function BaseValidateCodeForm(props) {
errorText={formError.validateCode ? props.translate(formError.validateCode) : ErrorUtils.getLatestErrorMessage(props.account)}
onFulfill={validateAndSubmitForm}
autoFocus
shouldDelayFocus={shouldDelayFocus}
/>
<OfflineWithFeedback
pendingAction={lodashGet(loginData, 'pendingFields.validateCodeSent', null)}
Expand Down