Skip to content

[CP Staging] fix: Unable to close currency list using device back button. #55575

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
Beamanator merged 3 commits into from
Jan 22, 2025
Merged

[CP Staging] fix: Unable to close currency list using device back button. #55575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
034c4ca
fix: Unable to close currency list using device back button.
Krishna2323 Jan 21, 2025
26a0914
fix input focus.
Krishna2323 Jan 22, 2025
f2d8340
Merge branch 'Expensify:main' into krishna2323/issue/55551
Krishna2323 Jan 22, 2025
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/components/CurrencyPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function CurrencyPicker({selectedCurrency, label = '', errorText = '', value, on
<Modal
type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
isVisible={isPickerVisible}
onClose={() => hidePickerModal}
onClose={hidePickerModal}
onModalHide={hidePickerModal}
hideModalContentWhileAnimating
useNativeDriver
Expand Down
9 changes: 7 additions & 2 deletions src/pages/workspace/WorkspaceConfirmationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import TextInput from '@components/TextInput';
import useAutoFocusInput from '@hooks/useAutoFocusInput';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import {createWorkspaceWithPolicyDraftAndNavigateToIt} from '@libs/actions/App';
Expand All @@ -39,6 +40,7 @@ function getFirstAlphaNumericCharacter(str = '') {
function WorkspaceConfirmationPage() {
const styles = useThemeStyles();
const {translate} = useLocalize();
const {inputCallbackRef} = useAutoFocusInput();

const validate = useCallback(
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CONFIRMATION_FORM>) => {
Expand Down Expand Up @@ -110,7 +112,10 @@ function WorkspaceConfirmationPage() {
title={translate('workspace.new.confirmWorkspace')}
onBackButtonPress={() => Navigation.goBack()}
/>
<ScrollView contentContainerStyle={styles.flexGrow1}>
<ScrollView
contentContainerStyle={styles.flexGrow1}
keyboardShouldPersistTaps="always"
>
<View style={[styles.ph5, styles.pv3]}>
<Text style={[styles.mb3, styles.webViewStyles.baseFontStyle, styles.textSupporting]}>{translate('workspace.emptyWorkspace.subtitle')}</Text>
</View>
Expand Down Expand Up @@ -156,14 +161,14 @@ function WorkspaceConfirmationPage() {
label={translate('workspace.common.workspaceName')}
accessibilityLabel={translate('workspace.common.workspaceName')}
spellCheck={false}
autoFocus
defaultValue={defaultWorkspaceName}
onChangeText={(str) => {
if (getFirstAlphaNumericCharacter(str) === getFirstAlphaNumericCharacter(workspaceNameFirstCharacter)) {
return;
}
setWorkspaceNameFirstCharacter(str);
}}
ref={inputCallbackRef}
/>

<View style={[styles.mhn5, styles.mt4]}>
Expand Down