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

Display the message for last requests with foreign currency that are created in offline mode #34011

Merged
merged 14 commits into from
Jan 24, 2024
Merged

Display the message for last requests with foreign currency that are created in offline mode #34011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ad03aca
fix: 33073
dukenv0307 Jan 5, 2024
9647635
remove most recent iou report action id
dukenv0307 Jan 5, 2024
ca811b3
Merge branch 'main' into fix/33073
dukenv0307 Jan 10, 2024
3b548b4
Merge branch 'main' into fix/33073
dukenv0307 Jan 15, 2024
43c38ba
only display pending message for foreign currency transaction
dukenv0307 Jan 15, 2024
ea5c3a2
fallback string instead of number
dukenv0307 Jan 15, 2024
6f3693e
Merge branch 'main' into fix/33073
dukenv0307 Jan 19, 2024
bd4d978
Revert "fallback string instead of number"
dukenv0307 Jan 19, 2024
4cfb299
Revert "only display pending message for foreign currency transaction"
dukenv0307 Jan 19, 2024
db3e96c
Revert "remove most recent iou report action id"
dukenv0307 Jan 19, 2024
86a4108
Revert "fix: 33073"
dukenv0307 Jan 19, 2024
7fcdc58
fix 33073
dukenv0307 Jan 19, 2024
3bd5950
add comment
dukenv0307 Jan 19, 2024
e16d282
edit comment
dukenv0307 Jan 23, 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
3 changes: 2 additions & 1 deletion src/pages/home/report/ReportActionItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,8 @@ function ReportActionItem(props) {
const iouReportID = originalMessage.IOUReportID ? originalMessage.IOUReportID.toString() : '0';
children = (
<MoneyRequestAction
chatReportID={props.report.reportID}
// If originalMessage.iouReportID is set, this is a 1:1 money request in a DM chat whose reportID is props.report.chatReportID
chatReportID={originalMessage.IOUReportID ? props.report.chatReportID : props.report.reportID}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you just add a comment explaining this check so the next person knows why we needed to do this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a comment.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ensure that this is in proper English. You can use freely available tools like ChatGPT 3.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try this

If originalMessage.iouReportID is set, this is a 1:1 money request in a DM chat whose reportID is props.report.chatReportID

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the comment.

requestReportID={iouReportID}
action={props.action}
isMostRecentIOUReportAction={props.isMostRecentIOUReportAction}
Expand Down
3 changes: 1 addition & 2 deletions src/pages/home/report/ReportActionsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ function ReportActionsView(props) {
const didSubscribeToReportTypingEvents = useRef(false);
const isFirstRender = useRef(true);
const hasCachedActions = useInitialValue(() => _.size(props.reportActions) > 0);
const mostRecentIOUReportActionID = useInitialValue(() => ReportActionsUtils.getMostRecentIOURequestActionID(props.reportActions));

const mostRecentIOUReportActionID = useMemo(() => ReportActionsUtils.getMostRecentIOURequestActionID(props.reportActions), [props.reportActions]);
const prevNetworkRef = useRef(props.network);
const prevAuthTokenType = usePrevious(props.session.authTokenType);

Expand Down
Loading