Skip to content

Remove deprecated methods and refactor code to be a little cleaner #33676

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
luacmartins merged 6 commits into from
Jan 8, 2024
Merged

Remove deprecated methods and refactor code to be a little cleaner #33676

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b6d67a
Remove deprecated methods and refactor code to be a little cleaner
tgolen Dec 27, 2023
577c104
Merge branch 'main' into tgolen-clean-flagcommentpage
tgolen Jan 8, 2024
26a10d6
Simplify refactoring
tgolen Jan 8, 2024
377960c
Default to empty object
tgolen Jan 8, 2024
1b34273
Update src/pages/FlagCommentPage.js
tgolen Jan 8, 2024
7669dc5
Update src/pages/FlagCommentPage.js
tgolen Jan 8, 2024
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
13 changes: 9 additions & 4 deletions src/pages/FlagCommentPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import compose from '@libs/compose';
import Navigation from '@libs/Navigation/Navigation';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
import * as ReportUtils from '@libs/ReportUtils';
import * as Report from '@userActions/Report';
import * as Session from '@userActions/Session';
Expand Down Expand Up @@ -43,10 +42,15 @@ const propTypes = {
}).isRequired,

...withLocalizePropTypes,

/* Onyx Props */
/** All the report actions from the parent report */
parentReportActions: PropTypes.objectOf(PropTypes.shape(reportActionPropTypes)),
};

const defaultProps = {
reportActions: {},
parentReportActions: {},
report: {},
};

Expand Down Expand Up @@ -120,18 +124,19 @@ function FlagCommentPage(props) {

// Handle threads if needed
if (reportAction === undefined || reportAction.reportActionID === undefined) {
reportAction = ReportActionsUtils.getParentReportAction(props.report);
reportAction = props.parentReportActions[props.report.parentReportActionID] || {};
}

return reportAction;
}, [props.report, props.reportActions, props.route.params.reportActionID]);
}, [props.report, props.reportActions, props.route.params.reportActionID, props.parentReportActions]);

const flagComment = (severity) => {
let reportID = getReportID(props.route);
const reportAction = getActionToFlag();
const parentReportAction = props.parentReportActions[props.report.parentReportActionID] || {};

// Handle threads if needed
if (ReportUtils.isChatThread(props.report) && reportAction.reportActionID === ReportActionsUtils.getParentReportAction(props.report).reportActionID) {
if (ReportUtils.isChatThread(props.report) && reportAction.reportActionID === parentReportAction.reportActionID) {
reportID = ReportUtils.getParentReport(props.report).reportID;
}

Expand Down