-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
Fix: Hold reason not bold #39452
Fix: Hold reason not bold #39452
Conversation
@hoangzinh Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
src/libs/actions/IOU.ts
Outdated
@@ -5171,7 +5172,7 @@ function putOnHold(transactionID: string, comment: string, reportID: string) { | |||
'HoldRequest', | |||
{ | |||
transactionID, | |||
comment, | |||
parsedComment, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
parsedComment, | |
comment: parsedComment, |
@dragnoir have you checked if API calls success or failed with your change in this line?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed, thank you @hoangzinh
@dragnoir could you help to test again if it works on your end? |
do you get an error with API? |
ah nope, but looks like BE returns a plain text instead of markdown |
Old unread messages will render as text, you need to create new hold messages with the updates on this PR. |
@dragnoir I know. So did you mean you tested it again and it still works on your end? If yes could you share recording again on Web? Thanks |
@hoangzinh something different from the backend was not happening when I created the PR. The message displays as HTML for a bit then changes to normal text. |
@dragnoir could you help to take a screenshot of API response? We might need help from @robertjchen to take a look at it again. |
@robertjchen Moreover, the action name is reverted to "ADDCOMMENT" again. Could you please take a look at this when you have time? Thanks |
Hi all, as a quick update- we had to revert the action name back to Given this situation, let's update the frontend to use |
We can for action name @robertjchen. Btw, how about the message payload? Base on comment here #39452 (comment), BE returns a plain text instead of HTML formatted. |
The backend does not/cannot process or apply any styling to the message, only the frontend can do this 🤔 If markdown is used in the raw message sent to the backend, does it come back properly formatted (after frontend processing)? |
It doesn't but if FE sends a formatted message to BE, BE should return the same as well (at least for action name "ADDCOMMENT") Screen.Recording.2024-04-08.at.17.45.53.mov |
@robertjchen what do you think? |
Hm, so that would seem like this would be a backend issue- the formatting is being stripped out before it is returned to the frontend? |
@robertjchen We are sending from the front end a message like that
if you can fix it so it turns:
And the |
Is the formatting being stripped on the frontend or backend? 🤔 The backend has no ability to restore any formatting so it would be good to determine where this is happening, as I'm not sure what should be changed on the backend at the moment.
Due to some compatibility issues we are using |
@robertjchen I updated the code based on your comment Please check the video, same issue always. 20240418_131124.mp4As you can see, when the function putOnHold send @hoangzinh what do you think? |
@dragnoir could you help to screenshot the request body? I think it would help @robertjchen debug on BE side |
@robertjchen here's the request body. The UI is sending {
"accountID": 15911514,
"accounts": {
"15911514": {
"lastUpdateID": 263749108,
"previousUpdateID": 263748720,
"updateIDs": [
263749106,
263749107,
263749108
]
}
},
"authToken": "5D7E81CEC8C618AC09B8550DAFAEF8F4B1E0F12C78FEF305AD2731C58BAE89A2003A0C17A9963A78804FC2132C5E6F3E6DFDEA879CF82E4F3AB7E6742209E44540D5DF2EE21CA7F74B4374BE80E2966E51B0FF7FE3F8BAD98DF96F3CB9288344F48A7B88E74B02B6DE8C36A2A16D315B12C84176D82C769FC4A1B42D20A9D2AAF48DC83704949423A346C729D1FF0E8600762B132682CDEF53A81E59D71DAA196908614CE5F9BDAB4F41A9FF6ED776858141A3FB16B4F28D940B8D2C8384332BAD5B9E21BE80892AEB03096AAA48A6FCF3A76DF56691AC5F6243C3A9079FF7AA04193CC73A93289B3327C6E6CD497D42841ABCB4A3546B264D32003E7385428E581A116A3EE167173F2F8D262F676F110B60F3B15ECA8EF50411F4B4C7C5609162C3A846AD17DBB87D1CE9EFD85B5C8C18A5D57F231428A905D0C4717095DC5DE1DADE65D1B8D2CDC63618778F43AB9AF5E01D4B44EDF736A12539BB17EDFE99",
"email": "[email protected]",
"fetchableOnyxUpdates": [
"263749106",
"263749107",
"263749108"
],
"onyxUpdates": {
"263749106": [
{
"key": "report_7461782389439403",
"onyxMethod": "merge",
"value": {
"lastActorAccountID": 15911514,
"lastMessageText": "",
"lastVisibleActionCreated": "2024-04-18 17:00:04.418",
"reportID": "7461782389439403"
}
},
{
"key": "reportActions_7461782389439403",
"onyxMethod": "merge",
"value": {
"5210771277106534177": {
"actionName": "HOLD",
"actorAccountID": 15911514,
"avatar": "https:\/\/d1wpcgnaa73g0y.cloudfront.net\/6bae9da33ba6673355d9368dcec5181cf5409cf7_128.jpeg",
"created": "2024-04-18 17:00:04.418",
"lastModified": "2024-04-18 17:00:04.418",
"message": [
{
"html": "",
"text": "",
"type": "COMMENT"
}
],
"originalMessage": {
"accountID": 15911514,
"date": "2024-04-18 17:00:04",
"lastModified": "2024-04-18 17:00:04.418",
"message": "italic"
},
"person": [
{
"text": "Rachid L.",
"type": "TEXT"
}
],
"previousReportActionID": "1859069962268695973",
"reportActionID": "5210771277106534177",
"shouldShow": true
}
}
}
],
"263749107": [
{
"key": "report_7461782389439403",
"onyxMethod": "merge",
"value": {
"lastActorAccountID": 15911514,
"lastMessageText": "italic",
"lastVisibleActionCreated": "2024-04-18 17:00:04.419",
"reportID": "7461782389439403"
}
},
{
"key": "reportActions_7461782389439403",
"onyxMethod": "merge",
"shouldShowPushNotification": true,
"value": {
"9174517809151477469": {
"actionName": "ADDCOMMENT",
"actorAccountID": 15911514,
"avatar": "https:\/\/d1wpcgnaa73g0y.cloudfront.net\/6bae9da33ba6673355d9368dcec5181cf5409cf7_128.jpeg",
"created": "2024-04-18 17:00:04.419",
"lastModified": "2024-04-18 17:00:04.419",
"message": [
{
"html": "italic",
"text": "italic",
"type": "COMMENT"
}
],
"originalMessage": {
"html": "italic",
"lastModified": "2024-04-18 17:00:04.419"
},
"person": [
{
"text": "Rachid L.",
"type": "TEXT"
}
],
"previousReportActionID": "5210771277106534177",
"reportActionID": "9174517809151477469",
"shouldShow": true
}
}
}
],
"263749108": [
{
"key": "transactions_244319724081443296",
"onyxMethod": "merge",
"value": {
"comment": {
"hold": "5210771277106534177"
}
}
},
{
"key": "report_6646960247708600",
"onyxMethod": "merge",
"value": {
"avatarUrl": null,
"chatReportID": "6694510361629708",
"chatType": "",
"currency": "TND",
"description": "",
"fieldList": null,
"hasOutstandingChildRequest": false,
"hasParentAccess": true,
"invoiceReceiver": null,
"iouReportID": null,
"isCancelledIOU": false,
"isDeletedParentAction": null,
"isOwnPolicyExpenseChat": false,
"isPinned": false,
"isWaitingOnBankAccount": false,
"lastActionType": "IOU",
"lastActorAccountID": "15911514",
"lastMentionedTime": null,
"lastMessageHtml": "",
"lastMessageText": "",
"lastReadSequenceNumber": 0,
"lastReadTime": "2024-04-15 11:47:39.413",
"lastVisibleActionCreated": "2024-04-15 11:47:31.452",
"lastVisibleActionLastModified": "2024-04-15 11:47:31.452",
"managerID": 15911514,
"nonReimbursableTotal": 0,
"notificationPreference": "always",
"oldPolicyName": "",
"ownerAccountID": 15911514,
"parentReportActionID": "8363121392860620561",
"parentReportID": "6694510361629708",
"participantAccountIDs": [
15911514
],
"participants": {
"15911514": {
"hidden": false
}
},
"policyAvatar": null,
"policyID": "2E2EED6C353ED0E9",
"policyName": null,
"reportID": "6646960247708600",
"reportName": "Expense Report #6646960247708600",
"stateNum": 1,
"statusNum": 1,
"submitterPayPalMeAddress": "",
"total": -4958,
"type": "expense",
"unheldTotal": -1552,
"visibility": null,
"visibleChatMemberAccountIDs": [
15911514
],
"welcomeMessage": "",
"writeCapability": "all"
}
}
]
},
"httpCode": 200,
"jsonCode": 200,
"authResponseMessage": "200 OK",
"requestID": "8766357e989a41b9-MRS",
"onyxData": [
{
"key": "report_7461782389439403",
"onyxMethod": "merge",
"value": {
"lastActorAccountID": 15911514,
"lastMessageText": "",
"lastVisibleActionCreated": "2024-04-18 17:00:04.418",
"reportID": "7461782389439403"
}
},
{
"key": "reportActions_7461782389439403",
"onyxMethod": "merge",
"value": {
"5210771277106534177": {
"actionName": "HOLD",
"actorAccountID": 15911514,
"avatar": "https:\/\/d1wpcgnaa73g0y.cloudfront.net\/6bae9da33ba6673355d9368dcec5181cf5409cf7_128.jpeg",
"created": "2024-04-18 17:00:04.418",
"lastModified": "2024-04-18 17:00:04.418",
"message": [
{
"html": "",
"text": "",
"type": "COMMENT"
}
],
"originalMessage": {
"accountID": 15911514,
"date": "2024-04-18 17:00:04",
"lastModified": "2024-04-18 17:00:04.418",
"message": "italic"
},
"person": [
{
"text": "Rachid L.",
"type": "TEXT"
}
],
"previousReportActionID": "1859069962268695973",
"reportActionID": "5210771277106534177",
"shouldShow": true
}
}
},
{
"key": "report_7461782389439403",
"onyxMethod": "merge",
"value": {
"lastActorAccountID": 15911514,
"lastMessageText": "italic",
"lastVisibleActionCreated": "2024-04-18 17:00:04.419",
"reportID": "7461782389439403"
}
},
{
"key": "reportActions_7461782389439403",
"onyxMethod": "merge",
"shouldShowPushNotification": true,
"value": {
"9174517809151477469": {
"actionName": "ADDCOMMENT",
"actorAccountID": 15911514,
"avatar": "https:\/\/d1wpcgnaa73g0y.cloudfront.net\/6bae9da33ba6673355d9368dcec5181cf5409cf7_128.jpeg",
"created": "2024-04-18 17:00:04.419",
"lastModified": "2024-04-18 17:00:04.419",
"message": [
{
"html": "italic",
"text": "italic",
"type": "COMMENT"
}
],
"originalMessage": {
"html": "italic",
"lastModified": "2024-04-18 17:00:04.419"
},
"person": [
{
"text": "Rachid L.",
"type": "TEXT"
}
],
"previousReportActionID": "5210771277106534177",
"reportActionID": "9174517809151477469",
"shouldShow": true
}
}
},
{
"key": "transactions_244319724081443296",
"onyxMethod": "merge",
"value": {
"comment": {
"hold": "5210771277106534177"
}
}
},
{
"key": "report_6646960247708600",
"onyxMethod": "merge",
"value": {
"avatarUrl": null,
"chatReportID": "6694510361629708",
"chatType": "",
"currency": "TND",
"description": "",
"fieldList": null,
"hasOutstandingChildRequest": false,
"hasParentAccess": true,
"invoiceReceiver": null,
"iouReportID": null,
"isCancelledIOU": false,
"isDeletedParentAction": null,
"isOwnPolicyExpenseChat": false,
"isPinned": false,
"isWaitingOnBankAccount": false,
"lastActionType": "IOU",
"lastActorAccountID": "15911514",
"lastMentionedTime": null,
"lastMessageHtml": "",
"lastMessageText": "",
"lastReadSequenceNumber": 0,
"lastReadTime": "2024-04-15 11:47:39.413",
"lastVisibleActionCreated": "2024-04-15 11:47:31.452",
"lastVisibleActionLastModified": "2024-04-15 11:47:31.452",
"managerID": 15911514,
"nonReimbursableTotal": 0,
"notificationPreference": "always",
"oldPolicyName": "",
"ownerAccountID": 15911514,
"parentReportActionID": "8363121392860620561",
"parentReportID": "6694510361629708",
"participantAccountIDs": [
15911514
],
"participants": {
"15911514": {
"hidden": false
}
},
"policyAvatar": null,
"policyID": "2E2EED6C353ED0E9",
"policyName": null,
"reportID": "6646960247708600",
"reportName": "Expense Report #6646960247708600",
"stateNum": 1,
"statusNum": 1,
"submitterPayPalMeAddress": "",
"total": -4958,
"type": "expense",
"unheldTotal": -1552,
"visibility": null,
"visibleChatMemberAccountIDs": [
15911514
],
"welcomeMessage": "",
"writeCapability": "all"
}
}
],
"previousUpdateID": 263748720,
"lastUpdateID": 263749108
} |
@dragnoir I think above comment is a response body not request body. 🤔 |
@dragnoir please let me know when the PR to fix bold style is ready for review |
@hoangzinh bold style fixed and removed the HTML rendering |
src/libs/ReportUtils.ts
Outdated
@@ -4503,7 +4503,7 @@ function buildOptimisticHoldReportActionComment(comment: string, created = DateU | |||
actorAccountID: currentUserAccountID, | |||
message: [ | |||
{ | |||
type: CONST.REPORT.MESSAGE.TYPE.TEXT, | |||
type: CONST.REPORT.MESSAGE.TYPE.COMMENT, | |||
style: 'normal', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Usually type COMMENT will have
{
type:
text:
html:
}
For example
Lines 4101 to 4104 in aa9bbcf
html: message, | |
text: message, | |
isEdited: false, | |
type: CONST.REPORT.MESSAGE.TYPE.COMMENT, |
Can you remove style
and add html
prop here? Thanks
@dragnoir can you address that small comment and then we can have this reviewed by the internal team. Thanks! |
Reviewer Checklist
Screenshots/VideosAndroid: NativeScreen.Recording.2024-05-27.at.23.32.00.android.movAndroid: mWeb ChromeScreen.Recording.2024-05-27.at.20.31.44.android.chrome.moviOS: NativeScreen.Recording.2024-05-27.at.22.40.49.ios.moviOS: mWeb SafariScreen.Recording.2024-05-27.at.22.38.47.ios.safari.movMacOS: Chrome / SafariScreen.Recording.2024-05-27.at.20.05.56.web.movMacOS: DesktopScreen.Recording.2024-05-27.at.20.12.45.desktop.mov |
@dragnoir overall looks good. Could you help to update Test steps to reflect what we are testing in this PR? (hold reason is not bold). Thanks |
done. Thank you |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by https://github.com/robertjchen in version: 1.4.77-0 🚀
|
🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.77-11 🚀
|
🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.77-11 🚀
|
Details
This PR fixes the held requests reason that appears bolded briefly after holding the request.
Fixed Issues
$ #40408
PROPOSAL: #40408 (comment)
Tests
Offline tests
QA Steps
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
20240522_101140.mp4
Android: mWeb Chrome
20240522_091228.mp4
iOS: Native
20240522_091129.mp4
iOS: mWeb Safari
20240522_091029.mp4
MacOS: Chrome / Safari
20240522_090420.mp4
MacOS: Desktop
20240522_090555.mp4