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.

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

Wrap the merchant text in the transaction field view #42131

Merged
merged 4 commits into from
May 24, 2024

Conversation

bernhardoj
Copy link
Contributor

Details

Currently, we only show merchant as single line in the transaction field view which will be truncated if it's very long. This PR makes it multiline.

Fixed Issues

$ #41925
PROPOSAL: #41925 (comment)

Tests

Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

  1. Submit a new expense with a very long merchant
  2. Open the transaction thread of the expense
  3. Verify the merchant is shown as multiline instead of truncated
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome Screenshot 2024-05-14 at 15 08 19
iOS: Native Screenshot 2024-05-14 at 15 07 56
iOS: mWeb Safari Screenshot 2024-05-14 at 15 08 47
MacOS: Chrome / Safari Screenshot 2024-05-14 at 15 04 48
MacOS: Desktop Screenshot 2024-05-14 at 15 05 19

@bernhardoj bernhardoj requested a review from a team as a code owner May 14, 2024 07:22
@melvin-bot melvin-bot bot requested review from dannymcclain and Ollyws and removed request for a team May 14, 2024 07:22
Copy link

melvin-bot bot commented May 14, 2024

@dannymcclain @Ollyws 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]

@bernhardoj
Copy link
Contributor Author

The app keeps not responding when I open the transaction thread on Android, so I can't screenshot it.

@dannymcclain
Copy link
Contributor

The line wrapping seems to be working well. I did notice that we're not converting URLs to actual links in the merchant field like we do in the description—is that expected right now?

CleanShot 2024-05-14 at 09 43 51@2x

CleanShot 2024-05-14 at 09 43 59@2x

@bernhardoj
Copy link
Contributor Author

@dannymcclain I believe yes because we don't support markdown for merchant, only description.

@Ollyws
Copy link
Contributor

Ollyws commented May 15, 2024

Just comfirming but our intention is to only show the merchant field multiline when editing a transaction and not on the expense confirmation screen?

Screenshot 2024-05-15 at 13 22 11

@dannymcclain
Copy link
Contributor

@Ollyws great catch. I think since we display the description as multi-line on the confirmation screen, it makes sense to do that with the merchant as well. I don't see why one would be treated differently than the other.

CleanShot 2024-05-15 at 08 31 23@2x

@bernhardoj
Copy link
Contributor Author

That makes sense but I would like to confirm 1 thing. I see that we actually set the description max line to 2 on the confirmation page.

But because we render the description as HTML (markdown), the component doesn't support the max line.

Do we want to apply the max line to 2 for merchants? Or don't limit the max line?

@dannymcclain
Copy link
Contributor

@Expensify/design what do you all think about the above? (The convo starting here about number of lines on the confirmation page)

@shawnborton
Copy link
Contributor

Yeah, I kind of think the intention behind Merchant is for it to be one-line and typically as few words as possible. Is that what you think too @trjExpensify?

So I think I'm okay with this inconsistency, just in the sense that I think these are slightly different things.

@trjExpensify
Copy link
Contributor

Yeah, I kind of think the intention behind Merchant is for it to be one-line and typically as few words as possible. Is that what you think too @trjExpensify?

Yep, agreed. A description is more of a free form field to expand on the purpose, whereas a merchant is a one-liner and typically a couple of words.

@dannymcclain
Copy link
Contributor

@shawnborton @trjExpensify that makes sense to me, but this issue is specifically about making it multi-line-able. So if it shows up as two lines on the expense and the preview, should it still only show up as one line on the confirmation screen?

Or do you all think that it should never be multiline? (Maybe check out #41925 for more details about why there's interest in making it multiline)

@shawnborton
Copy link
Contributor

Ah, I see now. Yeah, I think it's cool if we make the confirmation screen match the preview card, so we should allow two lines worth of text to display before truncating. Does that sound more in line with what you are thinking?

@dannymcclain
Copy link
Contributor

Ah, I see now. Yeah, I think it's cool if we make the confirmation screen match the preview card, so we should allow two lines worth of text to display before truncating. Does that sound more in line with what you are thinking?

Yeah that's what I was thinking!

@dubielzyk-expensify
Copy link
Contributor

Ahh, I see. I'm okay with that. I was initially thinking that we should just have 1 line for merchant and 1 line for description regardless of how long it is, but I'm okay with what you're suggesting

@bernhardoj
Copy link
Contributor Author

So, if I understand correctly, the agreement is to limit the merchant to be 2 lines on both the preview card and confirmation screen?

Or no limit for the preview card but limit for the confirmation screen to 2 lines?

@shawnborton
Copy link
Contributor

So, if I understand correctly, the agreement is to limit the merchant to be 2 lines on both the preview card and confirmation screen?

I think it's this, and I think we already have a 2 line max on the preview card? Or maybe we don't?

@dannymcclain
Copy link
Contributor

I think it's this, and I think we already have a 2 line max on the preview card? Or maybe we don't?

Yeah I'm pretty sure we already have that 2 line max on the preview card—and that's what we want.

So, if I understand correctly, the agreement is to limit the merchant to be 2 lines on both the preview card and confirmation screen?

Yes. Two lines max on the confirmation screen & preview. (This is what description should be doing anyways, but since we render as markdown/html, it doesn't obey the rules. But we don't need to dwell on that here.)

@bernhardoj
Copy link
Contributor Author

Sorry, it's not the preview card. What I mean is this one (idk what it is called, it's in the transaction thread)

image

I think we already have a 2 line max on the preview card? Or maybe we don't?

We are currently not limiting it by lines but by characters.

const description = truncate(requestComment, {length: CONST.REQUEST_PREVIEW.MAX_LENGTH});
const requestMerchant = truncate(merchant, {length: CONST.REQUEST_PREVIEW.MAX_LENGTH});

App/src/CONST.ts

Lines 171 to 172 in a03fecc

REQUEST_PREVIEW: {
MAX_LENGTH: 83,

@dannymcclain
Copy link
Contributor

Sorry, it's not the preview card. What I mean is this one (idk what it is called, it's in the transaction thread)

Ah gotcha. For the transaction thread, I don't know that we need to truncate at all. It looks like description has a max-character limit of 500 characters, and we don't truncate at all in the transaction thread. I don't see any problem with following that same pattern for merchant. Anyone else?

CleanShot 2024-05-16 at 09 01 53@2x

I think we already have a 2 line max on the preview card? Or maybe we don't?

We are currently not limiting it by lines but by characters.

That works too—let's just do it the same way for both.

@bernhardoj
Copy link
Contributor Author

For me, I agree to no limit it on the transaction thread, but limit it for the preview because it's a preview after all.

That works too—let's just do it the same way for both.

But I prefer to limit it by lines instead of characters.

You can see here that the ellipsis is shown even though there is still more space on the 2nd line
image

Also for description, it's possible to have many lines like below

image

So, I vote for:

preview card and confirmation screen: limit 2 lines
transaction thread: no limit

@dannymcclain
Copy link
Contributor

So, I vote for:
preview card and confirmation screen: limit 2 lines
transaction thread: no limit

I'm with you on this. I think we've run into problems in the past trying to truncate the preview with lines vs. characters, which is why it's truncated with characters. You're welcome to investigate, but my gut says it would be best to leave that alone.

Also for description, it's possible to have many lines like below

This is insane 😂 I had no idea you could do this. Coming from this issue, it seems like we'll likely be converting all those line breaks to spaces, and then truncating normally after that. So we might not need to worry about that situation here.

@bernhardoj
Copy link
Contributor Author

Ok, I have updated the merchant max line in confirmation screen to 2.
image

For the preview card, we are limiting it by character in #42243

Copy link
Contributor

@dannymcclain dannymcclain left a comment

Choose a reason for hiding this comment

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

From a design perspective, I think this is looking good. Definitely still get a solid technical review.

@Ollyws
Copy link
Contributor

Ollyws commented May 20, 2024

Couldn't get to this one today but should have it reviewed tomorrow.

@Ollyws
Copy link
Contributor

Ollyws commented May 21, 2024

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design 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.

Screenshots/Videos

Android: Native
01_Android_Native.mp4
Android: mWeb Chrome
02_Android_Chrome.mp4
iOS: Native
03_iOS_Native.mp4
iOS: mWeb Safari
04_iOS_Safari.mp4
MacOS: Chrome / Safari
05_MacOS_Chrome.mp4
MacOS: Desktop
06_MacOS_Desktop.mp4

Copy link
Contributor

@Ollyws Ollyws left a comment

Choose a reason for hiding this comment

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

LGTM.

@melvin-bot melvin-bot bot requested a review from srikarparsi May 21, 2024 11:41
Copy link
Contributor

@srikarparsi srikarparsi left a comment

Choose a reason for hiding this comment

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

lgtm as well

@chiragsalian chiragsalian merged commit 2f16abb into Expensify:main May 24, 2024
16 of 17 checks passed
@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants