Skip to content

fix: Content before dot separator is empty #60192

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

Merged
merged 35 commits into from
May 12, 2025
Merged

Conversation

daledah
Copy link
Contributor

@daledah daledah commented Apr 14, 2025

Explanation of Change

Fixed Issues

$ #60087
PROPOSAL: #60087 (comment)

Tests

  1. Create an expense
  2. Go offline.
  3. Right click on the expense preview > Delete expense.
  4. Delete the expense.
  5. Verify that: Expense deleted state (text with strikethrough) is shown, cursor display not-allowed.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

  • 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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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
Screen.Recording.2025-05-08.at.23.05.11.mov
Android: mWeb Chrome
Screen.Recording.2025-05-08.at.23.05.55.mov
iOS: Native
Screen.Recording.2025-05-08.at.23.06.51.mov
iOS: mWeb Safari
Screen.Recording.2025-05-08.at.23.07.38.mov
MacOS: Chrome / Safari
Screen.Recording.2025-05-08.at.23.08.39.mp4
MacOS: Desktop
Screen.Recording.2025-05-08.at.23.09.21.mov

@daledah daledah marked this pull request as ready for review April 14, 2025 17:44
@daledah daledah requested a review from a team as a code owner April 14, 2025 17:44
@melvin-bot melvin-bot bot requested review from allgandalf and removed request for a team April 14, 2025 17:44
Copy link

melvin-bot bot commented Apr 14, 2025

@allgandalf 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]

@allgandalf
Copy link
Contributor

allgandalf commented Apr 15, 2025

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • 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 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.ts 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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
Screen.Recording.2025-04-15.at.10.24.26.AM.mov
Android: mWeb Chrome
Screen.Recording.2025-04-15.at.10.23.34.AM.mov
iOS: Native
Screen.Recording.2025-04-15.at.10.20.55.AM.mov
iOS: mWeb Safari
Screen.Recording.2025-04-15.at.10.20.22.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-04-15.at.10.17.48.AM.mov
MacOS: Desktop
Screen.Recording.2025-04-15.at.10.19.46.AM.mov

@melvin-bot melvin-bot bot requested a review from mountiny April 15, 2025 04:55
@shawnborton
Copy link
Contributor

Similar comment I had in the other PR, why are we removing the big thumbnail placeholder upon delete? I would think that would stay in place, we just add the strikethrough style to the text:
CleanShot 2025-04-15 at 08 37 27@2x

@allgandalf
Copy link
Contributor

@shawnborton i'm lost here now, weren't these solutions preApproved (on other PR's as well)?

#60087 (comment)

@shawnborton
Copy link
Contributor

Looks like design wasn't tagged in that PR, so sorry for catching this one late!

@mountiny
Copy link
Contributor

discussing the optimistic delete report preview look here #60104 (comment)

@mountiny mountiny assigned allgandalf and daledah and unassigned allgandalf Apr 15, 2025
@mountiny
Copy link
Contributor

From @shawnborton:

Yeah, my thinking is that we keep the general shape and styles, we just use strikethrough for any text that's visible in the report preview and expense previews. Basically this as a rough idea:
CleanShot 2025-04-15 at 09 58 38@2x

@mountiny
Copy link
Contributor

mountiny commented Apr 15, 2025

This is for the report preview but for the expense preview the idea would be similar

@daledah would you be able to work on that for $250 bounty in the issue?

@allgandalf
Copy link
Contributor

bump @daledah

@daledah
Copy link
Contributor Author

daledah commented Apr 16, 2025

This is for the report preview but for the expense preview the idea would be similar
@daledah would you be able to work on that for $250 bounty in the issue?

Yes, i can take a look

@mountiny
Copy link
Contributor

Ping us in slack if you need anything, can you please prioritize this over new issues? thanks!

@daledah
Copy link
Contributor Author

daledah commented Apr 17, 2025

@mountiny I'll try to give an update today

@mountiny
Copy link
Contributor

@daledah any luck?

@daledah
Copy link
Contributor Author

daledah commented Apr 17, 2025

@mountiny @allgandalf @shawnborton i updated, is this expected?

result.mp4

@mountiny
Copy link
Contributor

I think in general yeas I am just not sure about the colour of the preview when its in the pending state cc @Expensify/design

@daledah
Copy link
Contributor Author

daledah commented May 8, 2025

@allgandalf Updated 👍

@allgandalf
Copy link
Contributor

On my to-do list for tomorrow

@allgandalf
Copy link
Contributor

@daledah I am still able to click on the expense and open it:

Screen.Recording.2025-05-09.at.11.25.42.AM.mov

Also jest is failing

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

Please look into ^

@trjExpensify
Copy link
Contributor

@daledah did you address the comments? Is it ready for another review?

@daledah
Copy link
Contributor Author

daledah commented May 9, 2025

I'm checking now

@daledah
Copy link
Contributor Author

daledah commented May 9, 2025

@allgandalf I updated. I might've missed a style when merging main 😅

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

@shawnborton can you give approval from design perspective please , this LGTM!

Screenshot 2025-05-12 at 10 34 02 AM

@trjExpensify
Copy link
Contributor

Can we see a video of it? I believe a couple of the recent bugs for us to confirm were:

  • The preview component was still clickable
  • The currency changed on deletion

Copy link
Contributor

🚧 @mountiny has triggered a test app build. You can view the workflow run here.

@mountiny
Copy link
Contributor

@daledah @allgandalf Could you provide that please?

@mountiny
Copy link
Contributor

this is looking good to me, there is still no offline pattern on the table view, but I think that should be out of scope so we can wrap this one up
https://github.com/user-attachments/assets/fde702f4-a0e2-480d-b915-3c25706b78be

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Changes look good to me, just waiting for the final design confirmation

Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
Android 🤖🔄 iOS 🍎🔄
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/60192-hybrid/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/60192-hybrid/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/60192/NewExpensify.dmg https://60192.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@trjExpensify
Copy link
Contributor

Mhm yeah, we should for'sure add the offline pattern to the table view. Who's going to take that follow-up?

@mountiny
Copy link
Contributor

I think we should just create a new issue for SWM for that #60087 this pr already moved quite a bit from the original issue

@shawnborton
Copy link
Contributor

All good on my end 👍

@trjExpensify
Copy link
Contributor

I think we should just create a new issue for SWM for that #60087 this pr already moved quite a bit from the original issue

For the breadcrumbs: #61848

@mountiny mountiny merged commit 205cfd6 into Expensify:main May 12, 2025
17 checks passed
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

Copy link
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.45-0 🚀

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

Copy link
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.45-0 🚀

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

Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 9.1.45-21 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 failure ❌
🍎 iOS 🍎 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.

7 participants