Fix expense preview with multiline description shows two spacings between each line in search page by bernhardoj · Pull Request #42243 · Expensify/App

bernhardoj · 2024-05-16T06:26:53Z

Details

We convert each new line with a space with \r|\n regex, but if the new line is \r\n, then there will be 2 spaces. This PR includes \r\n in the regex.

Fixed Issues

$ #41587
PROPOSAL: #41587 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Submit an expense to a user with no unsettled expense, and include a multiline description in the expense with a character length of more than 83*
Verify the expense preview in LHN shows one spacing between each line
Verify the report preview description in the chat is truncated
Click on the search icon
Verify the expense preview in the search list shows one spacing between each line
Submit a 2nd expense
Press the report preview to open the expense report
Verify the 1st money request preview (from step 1) in the expense report is truncated

*you can use this

This is line 1, this is line 1
This is line 2, this is line 2
This is line 3, this is line 3

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-05-16.at.14.22.11.mov

Android: mWeb Chrome

Screen.Recording.2024-05-16.at.14.23.00.mov

iOS: Native

Screen.Recording.2024-05-16.at.14.21.24.mov

iOS: mWeb Safari

Screen.Recording.2024-05-16.at.14.22.33.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-16.at.14.18.40.mov

MacOS: Desktop

Screen.Recording.2024-05-16.at.14.20.43.mov

melvin-bot · 2024-05-16T06:26:58Z

@dannymcclain @parasharrajat One of you needs to 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]

parasharrajat · 2024-05-16T14:59:42Z

@bernhardoj Let's fix this #41587 (comment) as well.

bernhardoj · 2024-05-16T15:21:00Z

If I understand from that comment, do we want to replace the line break with spaces in the preview too? Or just fix the weird ellipsis?

The weird ellipsis in @shawnborton screenshot is because we are limiting it by characters which we discuss here

cc: @dannymcclain

dannymcclain · 2024-05-16T16:30:10Z

If I understand from that comment, do we want to replace the line break with spaces in the preview too? Or just fix the weird ellipsis?

I think we want to replace the line breaks with spaces in the preview, and then truncate based on characters like normal. cc @shawnborton for a gut check on that. I'm curious if doing this will naturally fix the dangling ellipsis.

shawnborton · 2024-05-16T17:01:24Z

That sounds like a good plan to me Danny!

bernhardoj · 2024-05-17T06:08:49Z

Great, I have updated it to replace the line break with spaces and truncate it by characters.

Before:

After:

shawnborton · 2024-05-17T11:30:32Z

That feels pretty good to me.

One thing I saw today that is kind of related: super long descriptions show as more than one line in the Find chat UI:

Thoughts on addressing that one here as well?

bernhardoj · 2024-05-17T11:52:33Z

I can reproduce that one. We already have an issue created for that here and there is already a working proposal there. I think we can handle that one there.

shawnborton · 2024-05-17T11:54:18Z

Got it, sounds good.

dannymcclain · 2024-05-17T14:15:53Z

Great, I have updated it to replace the line break with spaces and truncate it by characters.

I think this is much much better.

dannymcclain

Given we're addressing the "find" issue elsewhere, this is looking good from a design perspective.

parasharrajat · 2024-05-17T19:34:52Z

Thanks for the update. Testing in 15 mins.

parasharrajat · 2024-05-18T18:24:48Z

@@ -0,0 +1,5 @@
+import CONST from '@src/CONST';
+
+export default function lineBreaksToSpaces(text = '') {


Let's move this to Stringutils.

parasharrajat · 2024-05-18T18:25:15Z

@@ -1,3 +1,4 @@
+import {truncate} from 'lodash';


Can we use something else like underscore. or use lodash/truncate way.

underscored is not in the report anymore. Updated to use lodash/truncate

parasharrajat · 2024-05-18T18:26:29Z

@@ -0,0 +1,5 @@
+import CONST from '@src/CONST';
+
+export default function lineBreaksToSpaces(text = '') {


Let's replace all other CONST.REGEX.LINE_BREAK usages with this function.

parasharrajat · 2024-05-21T09:26:04Z

BUG: Single request search Preview still shows multiple description on search page.

bernhardoj · 2024-05-21T12:28:42Z

We already discussed that before here

parasharrajat · 2024-05-21T14:32:33Z

OK. Great. That's the only issue I found. Completing the checklist now.

parasharrajat · 2024-05-21T18:20:07Z

Screenshots

🔲 iOS / native

Screen.Recording.2024-05-21.at.11.12.25.PM.mov

🔲 iOS / Safari

Screen.Recording.2024-05-21.at.11.47.33.PM.mov

🔲 MacOS / Desktop

Screen.Recording.2024-05-21.at.8.24.24.PM.mov

🔲 MacOS / Chrome

Screen.Recording.2024-05-21.at.8.13.17.PM.mov

🔲 Android / Chrome

Screen.Recording.2024-05-21.at.11.09.41.PM.mov

🔲 Android / native

Screen.Recording.2024-05-21.at.11.49.18.PM.mov

parasharrajat

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

🎀 👀 🎀 C+ reviewed

OSBotify · 2024-05-27T14:25:41Z

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 1.4.76-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2024-05-29T09:18:22Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.76-7 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

update line break regex

ee33be9

bernhardoj requested a review from a team as a code owner May 16, 2024 06:26

melvin-bot Bot requested review from dannymcclain and parasharrajat and removed request for a team May 16, 2024 06:26

bernhardoj mentioned this pull request May 16, 2024

[HOLD for payment 2024-06-05] Search - Expense preview with multiline description shows two spacings between each line #41587

Closed

6 tasks done

bernhardoj added 2 commits May 17, 2024 13:40

Merge branch 'main' into fix/41587-double-space

c569356

replace line break with space in money request preview and truncate it

9cc731c

remove type annotation

1af64fe

bernhardoj mentioned this pull request May 17, 2024

Wrap the merchant text in the transaction field view #42131

Merged

50 tasks done

dannymcclain previously approved these changes May 17, 2024

View reviewed changes

parasharrajat suggested changes May 18, 2024

View reviewed changes

bernhardoj added 3 commits May 20, 2024 16:49

move to string utils

d05b2d7

import a single function

7c7d04e

dry-ing

bd188bb

bernhardoj dismissed dannymcclain’s stale review via bd188bb May 20, 2024 08:51

prettier

9b9af32

parasharrajat approved these changes May 21, 2024

View reviewed changes

melvin-bot Bot requested a review from carlosmiceli May 21, 2024 18:20

carlosmiceli approved these changes May 21, 2024

View reviewed changes

carlosmiceli merged commit 07a90c7 into Expensify:main May 24, 2024

github-actions Bot mentioned this pull request May 27, 2024

Deploy Checklist: New Expensify 2024-05-27 #42636

Closed

69 tasks done

		@@ -0,0 +1,5 @@
		import CONST from '@src/CONST';

		export default function lineBreaksToSpaces(text = '') {

Conversation

bernhardoj commented May 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 16, 2024

Uh oh!

parasharrajat commented May 16, 2024

Uh oh!

bernhardoj commented May 16, 2024

Uh oh!

dannymcclain commented May 16, 2024

Uh oh!

shawnborton commented May 16, 2024

Uh oh!

bernhardoj commented May 17, 2024

Uh oh!

shawnborton commented May 17, 2024

Uh oh!

bernhardoj commented May 17, 2024

Uh oh!

shawnborton commented May 17, 2024

Uh oh!

dannymcclain commented May 17, 2024

Uh oh!

dannymcclain left a comment

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented May 17, 2024

Uh oh!

parasharrajat May 18, 2024

Choose a reason for hiding this comment

Uh oh!

bernhardoj May 20, 2024

Choose a reason for hiding this comment

Uh oh!

parasharrajat May 18, 2024

Choose a reason for hiding this comment

Uh oh!

bernhardoj May 20, 2024

Choose a reason for hiding this comment

Uh oh!

parasharrajat May 18, 2024

Choose a reason for hiding this comment

Uh oh!

bernhardoj May 20, 2024

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented May 21, 2024

Uh oh!

bernhardoj commented May 21, 2024

Uh oh!

parasharrajat commented May 21, 2024

Uh oh!

parasharrajat commented May 21, 2024

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

Uh oh!

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

Uh oh!

OSBotify commented May 27, 2024

Uh oh!

OSBotify commented May 29, 2024

Uh oh!

Reviewers

Uh oh!

Assignees

bernhardoj commented May 16, 2024 •

edited

Loading