From 07639b21f9ebaf4210b0de01cedc3de21e9c3379 Mon Sep 17 00:00:00 2001 From: Pujan Date: Thu, 5 Oct 2023 00:59:22 +0530 Subject: [PATCH 1/4] set displayName for components --- src/pages/AddPersonalBankAccountPage.js | 1 + src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 1 + src/pages/ReimbursementAccount/RequestorOnfidoStep.js | 1 + src/pages/ReimbursementAccount/ValidationStep.js | 1 + src/pages/SearchPage.js | 2 ++ src/pages/ShareCodePage.js | 1 + src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js | 1 + src/pages/workspace/WorkspaceInviteMessagePage.js | 1 + 8 files changed, 9 insertions(+) diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js index 7c04970c3980c..fbaa9dea14a84 100644 --- a/src/pages/AddPersonalBankAccountPage.js +++ b/src/pages/AddPersonalBankAccountPage.js @@ -147,6 +147,7 @@ class AddPersonalBankAccountPage extends React.Component { AddPersonalBankAccountPage.propTypes = propTypes; AddPersonalBankAccountPage.defaultProps = defaultProps; +AddPersonalBankAccountPage.displayName = 'AddPersonalBankAccountPage'; export default compose( withLocalize, diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js index afcd84ffa660c..ee330b1063026 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js @@ -486,6 +486,7 @@ class ReimbursementAccountPage extends React.Component { ReimbursementAccountPage.propTypes = propTypes; ReimbursementAccountPage.defaultProps = defaultProps; +ReimbursementAccountPage.displayName = 'ReimbursementAccountPage'; export default compose( withNetwork(), diff --git a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js index 72e3850aabd00..7ff7503493739 100644 --- a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js +++ b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js @@ -80,6 +80,7 @@ class RequestorOnfidoStep extends React.Component { RequestorOnfidoStep.propTypes = propTypes; RequestorOnfidoStep.defaultProps = defaultProps; +RequestorOnfidoStep.displayName = 'RequestorOnfidoStep'; export default compose( withLocalize, diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js index 851c4a4b2496c..e4654f760d173 100644 --- a/src/pages/ReimbursementAccount/ValidationStep.js +++ b/src/pages/ReimbursementAccount/ValidationStep.js @@ -229,6 +229,7 @@ class ValidationStep extends React.Component { ValidationStep.propTypes = propTypes; ValidationStep.defaultProps = defaultProps; +ValidationStep.displayName = 'ValidationStep'; export default compose( withLocalize, diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js index 141f4e841853a..a40cab5e54f67 100755 --- a/src/pages/SearchPage.js +++ b/src/pages/SearchPage.js @@ -201,6 +201,8 @@ class SearchPage extends Component { SearchPage.propTypes = propTypes; SearchPage.defaultProps = defaultProps; +// eslint-disable-next-line rulesdir/display-name-property +SearchPage.displayName = 'SearchPage'; export default compose( withLocalize, diff --git a/src/pages/ShareCodePage.js b/src/pages/ShareCodePage.js index e6d36ebc70701..f3b6830940431 100644 --- a/src/pages/ShareCodePage.js +++ b/src/pages/ShareCodePage.js @@ -122,5 +122,6 @@ class ShareCodePage extends React.Component { ShareCodePage.propTypes = propTypes; ShareCodePage.defaultProps = defaultProps; +ShareCodePage.displayName = 'ShareCodePage'; export default compose(withEnvironment, withLocalize, withCurrentUserPersonalDetails)(ShareCodePage); diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js index 7e8baba5a9cea..1c9abcf535f67 100644 --- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js +++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js @@ -335,6 +335,7 @@ class ContactMethodDetailsPage extends Component { ContactMethodDetailsPage.propTypes = propTypes; ContactMethodDetailsPage.defaultProps = defaultProps; +ContactMethodDetailsPage.displayName = 'ContactMethodDetailsPage'; export default compose( withLocalize, diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.js index ce9cc730ddbe6..2c69acd872807 100644 --- a/src/pages/workspace/WorkspaceInviteMessagePage.js +++ b/src/pages/workspace/WorkspaceInviteMessagePage.js @@ -238,6 +238,7 @@ class WorkspaceInviteMessagePage extends React.Component { WorkspaceInviteMessagePage.propTypes = propTypes; WorkspaceInviteMessagePage.defaultProps = defaultProps; +WorkspaceInviteMessagePage.displayName = 'WorkspaceInviteMessagePage'; export default compose( withLocalize, From ac14f27e5c23d6bd59f3b2eff29314c592ac3ecf Mon Sep 17 00:00:00 2001 From: Pujan Date: Thu, 5 Oct 2023 01:30:40 +0530 Subject: [PATCH 2/4] lint fix by avoiding setting displayName for class components --- src/pages/AddPersonalBankAccountPage.js | 3 +-- src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 3 +-- src/pages/ReimbursementAccount/RequestorOnfidoStep.js | 3 +-- src/pages/ReimbursementAccount/ValidationStep.js | 4 ++-- src/pages/SearchPage.js | 4 +--- src/pages/ShareCodePage.js | 3 +-- .../settings/Profile/Contacts/ContactMethodDetailsPage.js | 3 +-- src/pages/workspace/WorkspaceInviteMessagePage.js | 3 +-- 8 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js index fbaa9dea14a84..8c4106b4af20a 100644 --- a/src/pages/AddPersonalBankAccountPage.js +++ b/src/pages/AddPersonalBankAccountPage.js @@ -103,7 +103,7 @@ class AddPersonalBankAccountPage extends React.Component { includeSafeAreaPaddingBottom={shouldShowSuccess} shouldEnablePickerAvoiding={false} shouldShowOfflineIndicator={false} - testID={AddPersonalBankAccountPage.displayName} + testID='AddPersonalBankAccountPage' > + Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} @@ -486,7 +486,6 @@ class ReimbursementAccountPage extends React.Component { ReimbursementAccountPage.propTypes = propTypes; ReimbursementAccountPage.defaultProps = defaultProps; -ReimbursementAccountPage.displayName = 'ReimbursementAccountPage'; export default compose( withNetwork(), diff --git a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js index 7ff7503493739..86dfbfe9a2e63 100644 --- a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js +++ b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js @@ -44,7 +44,7 @@ class RequestorOnfidoStep extends React.Component { {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => ( <> @@ -201,8 +201,6 @@ class SearchPage extends Component { SearchPage.propTypes = propTypes; SearchPage.defaultProps = defaultProps; -// eslint-disable-next-line rulesdir/display-name-property -SearchPage.displayName = 'SearchPage'; export default compose( withLocalize, diff --git a/src/pages/ShareCodePage.js b/src/pages/ShareCodePage.js index f3b6830940431..3bffb12684b9a 100644 --- a/src/pages/ShareCodePage.js +++ b/src/pages/ShareCodePage.js @@ -74,7 +74,7 @@ class ShareCodePage extends React.Component { const isNative = platform === CONST.PLATFORM.IOS || platform === CONST.PLATFORM.ANDROID; return ( - + Navigation.goBack(isReport ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(this.props.report.reportID) : ROUTES.SETTINGS)} @@ -122,6 +122,5 @@ class ShareCodePage extends React.Component { ShareCodePage.propTypes = propTypes; ShareCodePage.defaultProps = defaultProps; -ShareCodePage.displayName = 'ShareCodePage'; export default compose(withEnvironment, withLocalize, withCurrentUserPersonalDetails)(ShareCodePage); diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js index 1c9abcf535f67..3059ea7de96a1 100644 --- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js +++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js @@ -251,7 +251,7 @@ class ContactMethodDetailsPage extends Component { return ( this.validateCodeFormRef.current && this.validateCodeFormRef.current.focus()} - testID={ContactMethodDetailsPage.displayName} + testID='ContactMethodDetailsPage' > Date: Thu, 5 Oct 2023 01:36:11 +0530 Subject: [PATCH 3/4] prettier --- src/pages/AddPersonalBankAccountPage.js | 2 +- src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 2 +- src/pages/ReimbursementAccount/RequestorOnfidoStep.js | 2 +- src/pages/ReimbursementAccount/ValidationStep.js | 2 +- src/pages/SearchPage.js | 2 +- src/pages/ShareCodePage.js | 2 +- src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js | 2 +- src/pages/workspace/WorkspaceInviteMessagePage.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js index 8c4106b4af20a..cc50f927d4285 100644 --- a/src/pages/AddPersonalBankAccountPage.js +++ b/src/pages/AddPersonalBankAccountPage.js @@ -103,7 +103,7 @@ class AddPersonalBankAccountPage extends React.Component { includeSafeAreaPaddingBottom={shouldShowSuccess} shouldEnablePickerAvoiding={false} shouldShowOfflineIndicator={false} - testID='AddPersonalBankAccountPage' + testID="AddPersonalBankAccountPage" > + Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} diff --git a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js index 86dfbfe9a2e63..2b043bd31087e 100644 --- a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js +++ b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js @@ -44,7 +44,7 @@ class RequestorOnfidoStep extends React.Component { {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => ( <> diff --git a/src/pages/ShareCodePage.js b/src/pages/ShareCodePage.js index 3bffb12684b9a..c59f7c6fac501 100644 --- a/src/pages/ShareCodePage.js +++ b/src/pages/ShareCodePage.js @@ -74,7 +74,7 @@ class ShareCodePage extends React.Component { const isNative = platform === CONST.PLATFORM.IOS || platform === CONST.PLATFORM.ANDROID; return ( - + Navigation.goBack(isReport ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(this.props.report.reportID) : ROUTES.SETTINGS)} diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js index 3059ea7de96a1..c53b0c99cf6fb 100644 --- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js +++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js @@ -251,7 +251,7 @@ class ContactMethodDetailsPage extends Component { return ( this.validateCodeFormRef.current && this.validateCodeFormRef.current.focus()} - testID='ContactMethodDetailsPage' + testID="ContactMethodDetailsPage" > Date: Thu, 5 Oct 2023 01:56:05 +0530 Subject: [PATCH 4/4] removed unnecessary comment --- src/pages/ReimbursementAccount/ValidationStep.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js index 1c6cbe67f1935..bfae630557b28 100644 --- a/src/pages/ReimbursementAccount/ValidationStep.js +++ b/src/pages/ReimbursementAccount/ValidationStep.js @@ -229,7 +229,6 @@ class ValidationStep extends React.Component { ValidationStep.propTypes = propTypes; ValidationStep.defaultProps = defaultProps; -// ValidationStep.displayName = 'ValidationStep'; export default compose( withLocalize,