Skip to content
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

Comment linking redirects #24411

Merged
merged 18 commits into from
Aug 28, 2023
Merged

Comment linking redirects #24411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
cd32eb6
Merge branch 'main' of https://github.com/margelo/expensify-app-fork
perunt Jul 12, 2023
1221bb6
Merge branch 'main' of https://github.com/Expensify/App
perunt Jul 12, 2023
964a141
Merge branch 'main' of https://github.com/Expensify/App
perunt Jul 24, 2023
95b44bb
Merge branch 'main' of https://github.com/margelo/expensify-app-fork
perunt Jul 26, 2023
009b8ba
Merge branch 'main' of https://github.com/Expensify/App
perunt Jul 26, 2023
d70eb2d
Merge branch 'main' of https://github.com/Expensify/App
perunt Jul 27, 2023
32dda58
update REPORT_WITH_ID
perunt Jul 27, 2023
69249e4
add reportActionID to prop types
perunt Jul 28, 2023
14fbc0d
lint
perunt Aug 11, 2023
5c07ca5
navigate user in the same screen
perunt Aug 18, 2023
21f1e0f
remove parseInt from link formatting
perunt Aug 18, 2023
24605b2
Merge branch 'main' of https://github.com/Expensify/App into comment-…
perunt Aug 18, 2023
f837398
Merge branch 'main' of https://github.com/Expensify/App into comment-…
perunt Aug 18, 2023
9cab901
Merge branch 'main' of https://github.com/Expensify/App into comment-…
perunt Aug 18, 2023
6b7a5f4
return linking in the same page after merge with main
perunt Aug 20, 2023
b509df1
remove prev step as it is no more needed
perunt Aug 21, 2023
cd78163
Merge branch 'main' of https://github.com/margelo/expensify-app-fork …
perunt Aug 28, 2023
feb0ecf
remove DEV_NEW_EXPENSIFY_URL_WITH_PORT_REGEX as it was fixed in main
perunt Aug 28, 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
2 changes: 1 addition & 1 deletion src/ROUTES.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default {
NEW_CHAT: 'new/chat',
NEW_TASK,
REPORT,
REPORT_WITH_ID: 'r/:reportID?',
REPORT_WITH_ID: 'r/:reportID/:reportActionID?',
EDIT_REQUEST: 'r/:threadReportID/edit/:field',
getEditRequestRoute: (threadReportID, field) => `r/${threadReportID}/edit/${field}`,
EDIT_CURRENCY_REQUEST: 'r/:threadReportID/edit/currency',
Expand Down
3 changes: 3 additions & 0 deletions src/pages/home/ReportScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ const propTypes = {
params: PropTypes.shape({
/** The ID of the report this screen should display */
reportID: PropTypes.string,

/** The reportActionID to scroll to */
reportActionID: PropTypes.string,
}).isRequired,
}).isRequired,

Expand Down