diff --git a/src/components/AvatarCropModal/AvatarCropModal.js b/src/components/AvatarCropModal/AvatarCropModal.js index baa958106f84..d16ba1364b71 100644 --- a/src/components/AvatarCropModal/AvatarCropModal.js +++ b/src/components/AvatarCropModal/AvatarCropModal.js @@ -366,6 +366,7 @@ function AvatarCropModal(props) { style={[styles.pb0]} includePaddingTop={false} includeSafeAreaPaddingBottom={false} + testID="AvatarCropModal" > {props.isSmallScreenWidth && } {({safeAreaPaddingBottomStyle}) => ( diff --git a/src/components/HeaderPageLayout.js b/src/components/HeaderPageLayout.js index bec1e52b1cad..b57a5bc85e82 100644 --- a/src/components/HeaderPageLayout.js +++ b/src/components/HeaderPageLayout.js @@ -58,6 +58,7 @@ function HeaderPageLayout({backgroundColor, children, footer, headerContainerSty shouldEnablePickerAvoiding={false} includeSafeAreaPaddingBottom={false} offlineIndicatorStyle={[appBGColor]} + testID="HeaderPageLayout" > {({safeAreaPaddingBottomStyle}) => ( <> diff --git a/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js b/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js index 1149f9dc56ce..d0d52daa9206 100644 --- a/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js +++ b/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js @@ -64,6 +64,7 @@ function YearPickerModal(props) { style={[styles.pb0]} includePaddingTop={false} includeSafeAreaPaddingBottom={false} + testID="YearPickerModal" > @@ -42,7 +41,7 @@ function ReimbursementAccountLoadingIndicator(props) { style={styles.loadingVBAAnimation} /> - {props.translate('reimbursementAccountLoadingAnimation.explanationLine')} + {translate('reimbursementAccountLoadingAnimation.explanationLine')} ) : ( @@ -56,4 +55,4 @@ function ReimbursementAccountLoadingIndicator(props) { ReimbursementAccountLoadingIndicator.propTypes = propTypes; ReimbursementAccountLoadingIndicator.displayName = 'ReimbursementAccountLoadingIndicator'; -export default compose(withLocalize, withNetwork())(ReimbursementAccountLoadingIndicator); +export default ReimbursementAccountLoadingIndicator; diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js index f760e5d5aeb4..1cad1e96b26d 100644 --- a/src/components/ScreenWrapper/index.js +++ b/src/components/ScreenWrapper/index.js @@ -109,6 +109,7 @@ class ScreenWrapper extends React.Component { style={styles.flex1} // eslint-disable-next-line react/jsx-props-no-spreading {...(this.props.environment === CONST.ENVIRONMENT.DEV ? this.panResponder.panHandlers : {})} + testID={this.props.testID} > +
descriptionInputRef.current && descriptionInputRef.current.focus()} + testID="EditRequestDescriptionPage" > merchantInputRef.current && merchantInputRef.current.focus()} + testID="EditRequestMerchantPage" > + {() => { if (this.props.userWallet.errorCode === CONST.WALLET.ERROR.KYC) { return ( diff --git a/src/pages/ErrorPage/NotFoundPage.js b/src/pages/ErrorPage/NotFoundPage.js index f0121cd8f3ef..bcf0da3ae9a2 100644 --- a/src/pages/ErrorPage/NotFoundPage.js +++ b/src/pages/ErrorPage/NotFoundPage.js @@ -5,7 +5,7 @@ import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoun // eslint-disable-next-line rulesdir/no-negated-variables function NotFoundPage() { return ( - + ); diff --git a/src/pages/FlagCommentPage.js b/src/pages/FlagCommentPage.js index 1a9a2d8c8767..6af38c84b582 100644 --- a/src/pages/FlagCommentPage.js +++ b/src/pages/FlagCommentPage.js @@ -154,7 +154,10 @@ function FlagCommentPage(props) { )); return ( - + {({safeAreaPaddingBottomStyle}) => ( diff --git a/src/pages/GetAssistancePage.js b/src/pages/GetAssistancePage.js index 34f996936654..d5b790a3b5ca 100644 --- a/src/pages/GetAssistancePage.js +++ b/src/pages/GetAssistancePage.js @@ -78,7 +78,7 @@ function GetAssistancePage(props) { } return ( - + Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js index cb54aa8e5a7b..a90ae3030ba2 100755 --- a/src/pages/NewChatPage.js +++ b/src/pages/NewChatPage.js @@ -173,6 +173,7 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, translate}) includeSafeAreaPaddingBottom={false} includePaddingTop={false} shouldEnableMaxHeight + testID="NewChatPage" > {({safeAreaPaddingBottomStyle, insets}) => ( focusAndUpdateMultilineInputRange(privateNotesInput.current)} + testID="PrivateNotesEditPage" > + + + Navigation.goBack(navigateBackTo)} diff --git a/src/pages/ReimbursementAccount/ACHContractStep.js b/src/pages/ReimbursementAccount/ACHContractStep.js index 1ef43843571c..38604f0bf2b9 100644 --- a/src/pages/ReimbursementAccount/ACHContractStep.js +++ b/src/pages/ReimbursementAccount/ACHContractStep.js @@ -145,7 +145,10 @@ function ACHContractStep(props) { }; return ( - + + + + + + Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} @@ -385,7 +385,7 @@ class ReimbursementAccountPage extends React.Component { if (errorText) { return ( - + + + diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js index 6ccb7a0c2e87..fe68a5d7ed2b 100755 --- a/src/pages/ReportParticipantsPage.js +++ b/src/pages/ReportParticipantsPage.js @@ -99,7 +99,10 @@ function ReportParticipantsPage(props) { })); return ( - + {({safeAreaPaddingBottomStyle}) => ( {({didScreenTransitionEnd}) => ( diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js index 2ee29380ff80..ce43b757428a 100755 --- a/src/pages/SearchPage.js +++ b/src/pages/SearchPage.js @@ -169,7 +169,10 @@ class SearchPage extends Component { ); return ( - + {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => ( <> diff --git a/src/pages/ShareCodePage.js b/src/pages/ShareCodePage.js index a36149a5f4fa..6f35bf1b3600 100644 --- a/src/pages/ShareCodePage.js +++ b/src/pages/ShareCodePage.js @@ -54,7 +54,7 @@ class ShareCodePage extends React.Component { const isNative = platform === CONST.PLATFORM.IOS || platform === CONST.PLATFORM.ANDROID; return ( - + Navigation.goBack(isReport ? ROUTES.getReportDetailsRoute(this.props.report.reportID) : ROUTES.SETTINGS)} diff --git a/src/pages/TeachersUnite/ImTeacherPage.js b/src/pages/TeachersUnite/ImTeacherPage.js index dbeba700d208..d4e69dd5dd3b 100644 --- a/src/pages/TeachersUnite/ImTeacherPage.js +++ b/src/pages/TeachersUnite/ImTeacherPage.js @@ -19,7 +19,7 @@ function ImTeacherPage() { const {translate} = useLocalize(); return ( - + Navigation.goBack(ROUTES.TEACHERS_UNITE)} diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js index fe25c54cb8cc..10bc47c00556 100644 --- a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js +++ b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js @@ -80,7 +80,10 @@ function IntroSchoolPrincipalPage(props) { ); return ( - + Navigation.goBack(ROUTES.TEACHERS_UNITE)} diff --git a/src/pages/TeachersUnite/KnowATeacherPage.js b/src/pages/TeachersUnite/KnowATeacherPage.js index 795bc170a83c..774217899ce4 100644 --- a/src/pages/TeachersUnite/KnowATeacherPage.js +++ b/src/pages/TeachersUnite/KnowATeacherPage.js @@ -91,7 +91,10 @@ function KnowATeacherPage(props) { ); return ( - + Navigation.goBack(ROUTES.TEACHERS_UNITE)} diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js index d275b6a4863f..f2b0875dbc53 100644 --- a/src/pages/home/ReportScreen.js +++ b/src/pages/home/ReportScreen.js @@ -16,15 +16,14 @@ import * as ReportUtils from '../../libs/ReportUtils'; import ReportActionsView from './report/ReportActionsView'; import ReportActionsSkeletonView from '../../components/ReportActionsSkeletonView'; import reportActionPropTypes from './report/reportActionPropTypes'; -import {withNetwork} from '../../components/OnyxProvider'; +import useNetwork from '../../hooks/useNetwork'; +import useWindowDimensions from '../../hooks/useWindowDimensions'; +import useLocalize from '../../hooks/useLocalize'; import compose from '../../libs/compose'; import Visibility from '../../libs/Visibility'; -import networkPropTypes from '../../components/networkPropTypes'; -import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions'; import OfflineWithFeedback from '../../components/OfflineWithFeedback'; import ReportFooter from './report/ReportFooter'; import Banner from '../../components/Banner'; -import withLocalize from '../../components/withLocalize'; import reportPropTypes from '../reportPropTypes'; import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView'; import withViewportOffsetTop, {viewportOffsetTopPropTypes} from '../../components/withViewportOffsetTop'; @@ -80,9 +79,6 @@ const propTypes = { }), ), - /** Information about the network */ - network: networkPropTypes.isRequired, - /** The account manager report ID */ accountManagerReportID: PropTypes.string, @@ -92,7 +88,6 @@ const propTypes = { /** Whether user is leaving the current report */ userLeavingStatus: PropTypes.bool, - ...windowDimensionsPropTypes, ...viewportOffsetTopPropTypes, ...withCurrentReportIDPropTypes, }; @@ -142,9 +137,6 @@ function ReportScreen({ accountManagerReportID, personalDetails, policies, - translate, - network, - isSmallScreenWidth, isSidebarLoaded, viewportOffsetTop, isComposerFullSize, @@ -152,6 +144,10 @@ function ReportScreen({ userLeavingStatus, currentReportID, }) { + const {translate} = useLocalize(); + const {isOffline} = useNetwork(); + const {isSmallScreenWidth} = useWindowDimensions(); + const firstRenderRef = useRef(true); const flatListRef = useRef(); const reactionListRef = useRef(); @@ -364,6 +360,7 @@ function ReportScreen({ )} @@ -462,9 +459,6 @@ ReportScreen.displayName = 'ReportScreen'; export default compose( withViewportOffsetTop, - withLocalize, - withWindowDimensions, - withNetwork(), withCurrentReportID, withOnyx({ isSidebarLoaded: { diff --git a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js index 3d54306b6248..6697aa793f7e 100644 --- a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js +++ b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js @@ -34,6 +34,7 @@ function BaseSidebarScreen(props) { includeSafeAreaPaddingBottom={false} shouldEnableKeyboardAvoidingView={false} style={[styles.sidebar, Browser.isMobile() ? styles.userSelectNone : {}]} + testID="SidebarScreen" > {({insets}) => ( <> diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js index 1238d8934f75..7854960f8b78 100644 --- a/src/pages/iou/IOUCurrencySelection.js +++ b/src/pages/iou/IOUCurrencySelection.js @@ -131,6 +131,7 @@ function IOUCurrencySelection(props) { optionsSelectorRef.current && optionsSelectorRef.current.focus()} + testID="IOUCurrencySelection" > {({safeAreaPaddingBottomStyle}) => ( <> diff --git a/src/pages/iou/MoneyRequestCategoryPage.js b/src/pages/iou/MoneyRequestCategoryPage.js index 92934a505a04..63eb35d3d4a1 100644 --- a/src/pages/iou/MoneyRequestCategoryPage.js +++ b/src/pages/iou/MoneyRequestCategoryPage.js @@ -63,6 +63,7 @@ function MoneyRequestCategoryPage({route, report, iou}) { focusAndUpdateMultilineInputRange(inputRef.current)} + testID="MoneyRequestDescriptionPage" > inputRef.current && inputRef.current.focus()} + testID="MoneyRequestMerchantPage" > {({safeAreaPaddingBottomStyle}) => ( diff --git a/src/pages/iou/MoneyRequestTagPage.js b/src/pages/iou/MoneyRequestTagPage.js index 60be6035431c..b00643f65f4d 100644 --- a/src/pages/iou/MoneyRequestTagPage.js +++ b/src/pages/iou/MoneyRequestTagPage.js @@ -80,6 +80,7 @@ function MoneyRequestTagPage({route, report, policyTags, iou}) { + textInput.current && textInput.current.focus()} shouldEnableMaxHeight + testID="WaypointEditor" > waypointCount) && isFocused}> + {({safeAreaPaddingBottomStyle}) => ( optionsSelectorRef.current && optionsSelectorRef.current.focus()} + testID="MoneyRequestParticipantsPage" > {({safeAreaPaddingBottomStyle}) => ( diff --git a/src/pages/iou/steps/NewRequestAmountPage.js b/src/pages/iou/steps/NewRequestAmountPage.js index 6e44d8d57e32..c3b581cec642 100644 --- a/src/pages/iou/steps/NewRequestAmountPage.js +++ b/src/pages/iou/steps/NewRequestAmountPage.js @@ -176,6 +176,7 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) { includeSafeAreaPaddingBottom={false} shouldEnableKeyboardAvoidingView={false} onEntryTransitionEnd={focusTextInput} + testID="NewRequestAmountPage" > {({safeAreaPaddingBottomStyle}) => ( diff --git a/src/pages/settings/AboutPage/AboutPage.js b/src/pages/settings/AboutPage/AboutPage.js index 4af48b896fe0..105ea79637bb 100644 --- a/src/pages/settings/AboutPage/AboutPage.js +++ b/src/pages/settings/AboutPage/AboutPage.js @@ -81,7 +81,10 @@ function AboutPage(props) { ]; return ( - + {({safeAreaPaddingBottomStyle}) => ( <> + Navigation.goBack(ROUTES.SETTINGS_ABOUT)} diff --git a/src/pages/settings/Preferences/LanguagePage.js b/src/pages/settings/Preferences/LanguagePage.js index 706fa3b62db6..5004b85312f3 100644 --- a/src/pages/settings/Preferences/LanguagePage.js +++ b/src/pages/settings/Preferences/LanguagePage.js @@ -26,7 +26,10 @@ function LanguagePage(props) { })); return ( - + Navigation.goBack(ROUTES.SETTINGS_PREFERENCES)} diff --git a/src/pages/settings/Preferences/PriorityModePage.js b/src/pages/settings/Preferences/PriorityModePage.js index 0c3d28fe9d81..76791640f9bf 100644 --- a/src/pages/settings/Preferences/PriorityModePage.js +++ b/src/pages/settings/Preferences/PriorityModePage.js @@ -46,7 +46,10 @@ function PriorityModePage(props) { ); return ( - + Navigation.goBack(ROUTES.SETTINGS_PREFERENCES)} diff --git a/src/pages/settings/Preferences/ThemePage.js b/src/pages/settings/Preferences/ThemePage.js index 4e41d5fc7129..a901ee8d350a 100644 --- a/src/pages/settings/Preferences/ThemePage.js +++ b/src/pages/settings/Preferences/ThemePage.js @@ -35,7 +35,10 @@ function ThemePage(props) { })); return ( - + + this.validateCodeFormRef.current && this.validateCodeFormRef.current.focus()}> + this.validateCodeFormRef.current && this.validateCodeFormRef.current.focus()} + testID="ContactMethodDetailsPage" + > Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS)} diff --git a/src/pages/settings/Profile/Contacts/ContactMethodsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodsPage.js index 62e62183a156..41b44e5b6339 100644 --- a/src/pages/settings/Profile/Contacts/ContactMethodsPage.js +++ b/src/pages/settings/Profile/Contacts/ContactMethodsPage.js @@ -111,7 +111,10 @@ function ContactMethodsPage(props) { }); return ( - + Navigation.goBack(ROUTES.SETTINGS_PROFILE)} diff --git a/src/pages/settings/Profile/Contacts/NewContactMethodPage.js b/src/pages/settings/Profile/Contacts/NewContactMethodPage.js index 236b7c1c73aa..0de9c34e14b6 100644 --- a/src/pages/settings/Profile/Contacts/NewContactMethodPage.js +++ b/src/pages/settings/Profile/Contacts/NewContactMethodPage.js @@ -98,6 +98,7 @@ function NewContactMethodPage(props) { }} includeSafeAreaPaddingBottom={false} shouldEnableMaxHeight + testID="NewContactMethodPage" > + Navigation.goBack(ROUTES.SETTINGS_STATUS)} diff --git a/src/pages/settings/Profile/DisplayNamePage.js b/src/pages/settings/Profile/DisplayNamePage.js index d93eeed2689c..d4924636acbc 100644 --- a/src/pages/settings/Profile/DisplayNamePage.js +++ b/src/pages/settings/Profile/DisplayNamePage.js @@ -69,6 +69,7 @@ function DisplayNamePage(props) { + + Navigation.goBack(ROUTES.SETTINGS_PERSONAL_DETAILS)} diff --git a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js index 0caf20a3e128..4fb538ac59b6 100644 --- a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js +++ b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js @@ -71,6 +71,7 @@ function LegalNamePage(props) { + Navigation.goBack(ROUTES.SETTINGS_PROFILE)} diff --git a/src/pages/settings/Profile/ProfilePage.js b/src/pages/settings/Profile/ProfilePage.js index 1864ba60524c..edc6e29b58a6 100755 --- a/src/pages/settings/Profile/ProfilePage.js +++ b/src/pages/settings/Profile/ProfilePage.js @@ -107,7 +107,10 @@ function ProfilePage(props) { }, [props.currentUserPersonalDetails]); return ( - + Navigation.goBack(ROUTES.SETTINGS)} diff --git a/src/pages/settings/Profile/PronounsPage.js b/src/pages/settings/Profile/PronounsPage.js index 5f8824046d69..4f8fb7cdb0df 100644 --- a/src/pages/settings/Profile/PronounsPage.js +++ b/src/pages/settings/Profile/PronounsPage.js @@ -65,7 +65,10 @@ function PronounsPage({currentUserPersonalDetails}) { }; return ( - + Navigation.goBack(ROUTES.SETTINGS_PROFILE)} diff --git a/src/pages/settings/Profile/TimezoneInitialPage.js b/src/pages/settings/Profile/TimezoneInitialPage.js index 94cb40a3f6f3..101d5b2cf77b 100644 --- a/src/pages/settings/Profile/TimezoneInitialPage.js +++ b/src/pages/settings/Profile/TimezoneInitialPage.js @@ -41,7 +41,7 @@ function TimezoneInitialPage(props) { }; return ( - + Navigation.goBack(ROUTES.SETTINGS_PROFILE)} diff --git a/src/pages/settings/Profile/TimezoneSelectPage.js b/src/pages/settings/Profile/TimezoneSelectPage.js index 228bae5cbb6b..05de3657e0ac 100644 --- a/src/pages/settings/Profile/TimezoneSelectPage.js +++ b/src/pages/settings/Profile/TimezoneSelectPage.js @@ -78,7 +78,10 @@ function TimezoneSelectPage(props) { }; return ( - + Navigation.goBack(ROUTES.SETTINGS_TIMEZONE)} diff --git a/src/pages/settings/Report/NotificationPreferencePage.js b/src/pages/settings/Report/NotificationPreferencePage.js index 17bd77a235ce..5fdb07ceddfa 100644 --- a/src/pages/settings/Report/NotificationPreferencePage.js +++ b/src/pages/settings/Report/NotificationPreferencePage.js @@ -43,7 +43,10 @@ function NotificationPreferencePage(props) { ); return ( - + + roomNameInputRef.current && roomNameInputRef.current.focus()} includeSafeAreaPaddingBottom={false} + testID="RoomNamePage" > + + Navigation.goBack(ROUTES.SETTINGS_SECURITY)} diff --git a/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.js b/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.js index 16f9489d87b0..817bd9e5fb5b 100644 --- a/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.js +++ b/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.js @@ -24,6 +24,7 @@ function StepWrapper({ nameOnCardRef.current && nameOnCardRef.current.focus()} includeSafeAreaPaddingBottom={false} + testID="AddDebitCardPage" > + Navigation.goBack(ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE)} diff --git a/src/pages/settings/Wallet/TransferBalancePage.js b/src/pages/settings/Wallet/TransferBalancePage.js index b52695c2e922..10e591e5945b 100644 --- a/src/pages/settings/Wallet/TransferBalancePage.js +++ b/src/pages/settings/Wallet/TransferBalancePage.js @@ -137,7 +137,7 @@ function TransferBalancePage(props) { if (props.walletTransfer.shouldShowSuccess && !props.walletTransfer.loading) { return ( - + + + Navigation.goBack(ROUTES.SETTINGS)} diff --git a/src/pages/signin/SignInModal.js b/src/pages/signin/SignInModal.js index 50b0af0bfa05..03788298debf 100644 --- a/src/pages/signin/SignInModal.js +++ b/src/pages/signin/SignInModal.js @@ -22,6 +22,7 @@ function SignInModal() { style={[styles.highlightBG]} includeSafeAreaPaddingBottom={false} shouldEnableMaxHeight + testID="SignInModal" > diff --git a/src/pages/tasks/NewTaskDescriptionPage.js b/src/pages/tasks/NewTaskDescriptionPage.js index dacf368a574e..008e31a96c1d 100644 --- a/src/pages/tasks/NewTaskDescriptionPage.js +++ b/src/pages/tasks/NewTaskDescriptionPage.js @@ -57,6 +57,7 @@ function NewTaskDescriptionPage(props) { includeSafeAreaPaddingBottom={false} onEntryTransitionEnd={() => focusAndUpdateMultilineInputRange(inputRef.current)} shouldEnableMaxHeight + testID="NewTaskDescriptionPage" > inputRef.current && inputRef.current.focus()} includeSafeAreaPaddingBottom={false} shouldEnableMaxHeight + testID="NewTaskDetailsPage" > + Task.dismissModalAndClearOutTaskInfo()} diff --git a/src/pages/tasks/NewTaskTitlePage.js b/src/pages/tasks/NewTaskTitlePage.js index 14d7e7d23b9e..8b7401cc3023 100644 --- a/src/pages/tasks/NewTaskTitlePage.js +++ b/src/pages/tasks/NewTaskTitlePage.js @@ -77,6 +77,7 @@ function NewTaskTitlePage(props) { }} includeSafeAreaPaddingBottom={false} shouldEnableMaxHeight + testID="NewTaskTitlePage" > optionRef.current && optionRef.current.textInput.focus()} + testID="TaskAssigneeeSelectorModal" > {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => ( diff --git a/src/pages/tasks/TaskDescriptionPage.js b/src/pages/tasks/TaskDescriptionPage.js index 382e8d80d4ad..3a336486dbfd 100644 --- a/src/pages/tasks/TaskDescriptionPage.js +++ b/src/pages/tasks/TaskDescriptionPage.js @@ -67,6 +67,7 @@ function TaskDescriptionPage(props) { includeSafeAreaPaddingBottom={false} onEntryTransitionEnd={() => focusAndUpdateMultilineInputRange(inputRef.current)} shouldEnableMaxHeight + testID="TaskDescriptionPage" > {({didScreenTransitionEnd}) => ( diff --git a/src/pages/tasks/TaskShareDestinationSelectorModal.js b/src/pages/tasks/TaskShareDestinationSelectorModal.js index 44d7b1f6a633..45694492aaca 100644 --- a/src/pages/tasks/TaskShareDestinationSelectorModal.js +++ b/src/pages/tasks/TaskShareDestinationSelectorModal.js @@ -116,6 +116,7 @@ function TaskShareDestinationSelectorModal(props) { optionRef.current && optionRef.current.textInput.focus()} + testID="TaskShareDestinationSelectorModal" > {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => ( <> diff --git a/src/pages/tasks/TaskTitlePage.js b/src/pages/tasks/TaskTitlePage.js index be0884e971ae..71da6462b118 100644 --- a/src/pages/tasks/TaskTitlePage.js +++ b/src/pages/tasks/TaskTitlePage.js @@ -79,6 +79,7 @@ function TaskTitlePage(props) { includeSafeAreaPaddingBottom={false} onEntryTransitionEnd={() => inputRef.current && inputRef.current.focus()} shouldEnableMaxHeight + testID="TaskTitlePage" > {({didScreenTransitionEnd}) => ( diff --git a/src/pages/wallet/WalletStatementPage.js b/src/pages/wallet/WalletStatementPage.js index cbd9b72e3299..336f2cdda0aa 100644 --- a/src/pages/wallet/WalletStatementPage.js +++ b/src/pages/wallet/WalletStatementPage.js @@ -94,6 +94,7 @@ function WalletStatementPage(props) { + {({safeAreaPaddingBottomStyle}) => ( Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.js index 3baf84f54ccf..b72e71f18cc5 100644 --- a/src/pages/workspace/WorkspaceInviteMessagePage.js +++ b/src/pages/workspace/WorkspaceInviteMessagePage.js @@ -158,7 +158,10 @@ class WorkspaceInviteMessagePage extends React.Component { const policyName = lodashGet(this.props.policy, 'name'); return ( - + + {({didScreenTransitionEnd}) => { const sections = didScreenTransitionEnd ? getSections() : []; diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index 7bb9a91c130e..669b0e41b08d 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -344,6 +344,7 @@ function WorkspaceMembersPage(props) { {({insets}) => ( Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}