Polish for one-transaction view #39472

NikkiWines · 2024-04-03T02:51:53Z

Details

Follow up PR to #36934 to handle some bugs and edge cases.

Fixed Issues

$ #39512

Tests

Log into an account that is a member of a workspace and make a single money request on the workspace chat
Navigate to the workspace chat and click on the expense report preview
Confirm that opens the report and that you see a combined expense view showing the details of both the expense report and transaction thread with an updated simplified icon (non-diagonal version) without a total.
Modify some elements of the expense like the category, description, etc.
Confirm that the last text of the report in the LHN updates appropriately

Screen.Recording.2024-04-05.at.15.59.47.mov

Create another money request on the workspace chat
Navigate back to the expense report and click into one of the transactions
Add a comment or two on that transaction
Go back to the report and delete the transaction that you had just commented on
Confirm you do not see the combined one-transaction report view and instead see [Deleted Request] with some replies and the other transaction
Click into the replies and confirm they load correctly

Screen.Recording.2024-04-05.at.16.01.14.mov

Delete the other transaction on the report and confirm you still see the standard report view with [Deleted Request]

Screen.Recording.2024-04-05.at.16.01.48.mov

Verify that no errors appear in the JS console

Offline tests

N/A offline behavior not impacted

QA Steps

Same as test steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2024-04-05.at.18.12.05.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-04-05.at.18.00.09.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-04-05.at.18.05.19.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-04-05.at.15.59.47.mov

Screen.Recording.2024-04-05.at.16.01.14.mov

Screen.Recording.2024-04-05.at.16.01.48.mov

MacOS: Desktop

Screen.Recording.2024-04-05.at.16.26.31.mov

Screen.Recording.2024-04-05.at.16.27.10.mov

…t-actions

…eleted IOU requests

…to display

…essage.deleted

melvin-bot · 2024-04-06T01:14:09Z

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

jayeshmangwani · 2024-04-08T07:43:54Z

@allroundexperts, will you review this PR as you were the C+ for this PR , Or should I review it?
cc: @NikkiWines

allroundexperts · 2024-04-08T07:46:35Z

I can review @jayeshmangwani

…t-actions

NikkiWines · 2024-04-09T21:52:24Z

Friendly bump on this @allroundexperts 🙇

allroundexperts · 2024-04-10T10:22:47Z

On it today!

allroundexperts · 2024-04-11T19:05:12Z

Conflicts @NikkiWines

…t-actions

NikkiWines · 2024-04-11T21:42:51Z

updated!

allroundexperts · 2024-04-15T08:49:50Z

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

Screen.Recording.2024-05-03.at.1.37.32.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-05-03.at.1.33.20.AM.mov

iOS: Native

Screen.Recording.2024-05-03.at.1.32.44.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-05-03.at.1.27.36.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-03.at.1.19.50.AM.mov

MacOS: Desktop

Screen.Recording.2024-05-03.at.1.25.49.AM.mov

NikkiWines · 2024-04-22T22:37:37Z

I'm still unable to reproduce that currency / report total issue, but it's also been brought up before this PR here. So, @allroundexperts let's move forward with this as it is and

NikkiWines · 2024-04-24T16:37:52Z

@allroundexperts friendly bump 🙇

NikkiWines · 2024-04-27T00:53:03Z

Bumped in slack here

allroundexperts · 2024-04-28T20:51:26Z

Hi @NikkiWines!

The LHN is not reflecting correctly if the report has been submitted or not in offline mode.

Screen.Recording.2024-04-29.at.1.50.19.AM.mov

…t-actions

NikkiWines · 2024-04-30T23:37:03Z

@allroundexperts I can reproduce that bug but it doesn't seem specific to the one-transaction report view, so let's not hold this PR on that change 🙇

Screen.Recording.2024-04-30.at.16.36.30.mov

NikkiWines · 2024-05-01T16:29:42Z

@allroundexperts friendly bump 🙇

allroundexperts

Looking good!

melvin-bot · 2024-05-02T21:03:11Z

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

amyevans

LGTM! Just one NAB, feel free to merge

src/libs/ReportActionsUtils.ts

Co-authored-by: Amy Evans <amy@expensify.com>

…t-actions

amyevans

Nice!

OSBotify · 2024-05-03T20:39:26Z

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

kbecciv · 2024-05-07T14:35:17Z

This PR is failing because of issue #39450

The issue is reproducible in: All Platforms, didn't verify on mWeb yet.

1715081459641.39472_web.mp4

1715086381124.Screen_Recording_2024-05-07_at_3.52.18_PM.1.mov

1715081699781.39472_Android.mp4

1715081945664.39472_iOS.mp4

NikkiWines · 2024-05-08T06:30:07Z

Weird, that's one of the things I tested it on right before merging. I'll look into fixing it but since it's the same behavior as before it's not a blocker 👍

OSBotify · 2024-05-09T02:09:52Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.71-6 🚀

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

fix reversed actions logic

255255b

NikkiWines self-assigned this Apr 3, 2024

NikkiWines changed the title ~~Fix reversed actions logic~~ Polish for one-transaction view Apr 3, 2024

NikkiWines added 9 commits April 4, 2024 09:53

Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…

fba77cf

…t-actions

Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…

1d256b9

…t-actions

Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…

853f71b

…t-actions

don't display report as one-transaction report if it has previously d…

f9d5eaa

…eleted IOU requests

only include deleted IOUs if they have visible child actions we need …

a0a3ff0

…to display

move combined reportAction logic into ReportActionUtils

2e030d9

ensure lastMessageText is correct for oneTransaction reports

1ca6f0d

clarifying comment

7936ff1

minor style change and also use isMessageDeleted instead of originalM…

50a275c

…essage.deleted

NikkiWines marked this pull request as ready for review April 6, 2024 01:14

NikkiWines requested a review from a team as a code owner April 6, 2024 01:14

melvin-bot bot requested review from jayeshmangwani and removed request for a team April 6, 2024 01:14

NikkiWines requested review from allroundexperts and removed request for jayeshmangwani April 8, 2024 17:46

Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…

0e73e03

…t-actions

Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…

38adc1b

…t-actions

NikkiWines added 2 commits April 11, 2024 15:01

update stray function to pass correct params

48976d7

use const

6423f2b

lint 2

b1e1957

NikkiWines added 2 commits April 29, 2024 11:51

Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…

d241ff4

…t-actions

prettier

3714c38

allroundexperts approved these changes May 2, 2024

View reviewed changes

melvin-bot bot requested a review from amyevans May 2, 2024 21:03

amyevans previously approved these changes May 3, 2024

View reviewed changes

src/libs/ReportActionsUtils.ts Outdated Show resolved Hide resolved

Comment update

9fc9010

Co-authored-by: Amy Evans <amy@expensify.com>

NikkiWines dismissed amyevans’s stale review via 9fc9010 May 3, 2024 16:36

Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…

125c725

…t-actions

NikkiWines requested a review from amyevans May 3, 2024 16:46

NikkiWines added 2 commits May 3, 2024 11:21

add exception for checking report type

f7cdd3f

lint/style

007011d

amyevans approved these changes May 3, 2024

View reviewed changes

amyevans merged commit 1fc0339 into main May 3, 2024
15 checks passed

amyevans deleted the nikki-load-oldest-actions branch May 3, 2024 20:32

github-actions bot mentioned this pull request May 7, 2024

Deploy Checklist: New Expensify 2024-05-07 #41716

Closed

c3024 mentioned this pull request Jun 1, 2024

[$250] Track expense - System message appears on wrong LHN report after changing merchant or desc #42858

Closed

6 tasks

NikkiWines mentioned this pull request Jun 26, 2024

IOU - Comment on a deleted IOU isn't opening from the combined report view #39512

Closed

6 tasks

c3024 mentioned this pull request Jul 29, 2024

[HOLD for payment 2024-07-24] [$250] Submitting Expense from Self DM Results in Duplicate Submissions #42795

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Polish for one-transaction view #39472

Polish for one-transaction view #39472

NikkiWines commented Apr 3, 2024 •

edited

Loading

melvin-bot bot commented Apr 6, 2024

jayeshmangwani commented Apr 8, 2024

allroundexperts commented Apr 8, 2024

NikkiWines commented Apr 9, 2024

allroundexperts commented Apr 10, 2024

allroundexperts commented Apr 11, 2024

NikkiWines commented Apr 11, 2024

allroundexperts commented Apr 15, 2024 •

edited

Loading

NikkiWines commented Apr 22, 2024

NikkiWines commented Apr 24, 2024

NikkiWines commented Apr 27, 2024

allroundexperts commented Apr 28, 2024

NikkiWines commented Apr 30, 2024

NikkiWines commented May 1, 2024

allroundexperts left a comment

melvin-bot bot commented May 2, 2024

amyevans left a comment

amyevans left a comment

OSBotify commented May 3, 2024

kbecciv commented May 7, 2024

NikkiWines commented May 8, 2024

OSBotify commented May 9, 2024

Polish for one-transaction view #39472

Polish for one-transaction view #39472

Conversation

NikkiWines commented Apr 3, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 6, 2024

jayeshmangwani commented Apr 8, 2024

allroundexperts commented Apr 8, 2024

NikkiWines commented Apr 9, 2024

allroundexperts commented Apr 10, 2024

allroundexperts commented Apr 11, 2024

NikkiWines commented Apr 11, 2024

allroundexperts commented Apr 15, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

NikkiWines commented Apr 22, 2024

NikkiWines commented Apr 24, 2024

NikkiWines commented Apr 27, 2024

allroundexperts commented Apr 28, 2024

NikkiWines commented Apr 30, 2024

NikkiWines commented May 1, 2024

allroundexperts left a comment

Choose a reason for hiding this comment

melvin-bot bot commented May 2, 2024

amyevans left a comment

Choose a reason for hiding this comment

amyevans left a comment

Choose a reason for hiding this comment

OSBotify commented May 3, 2024

kbecciv commented May 7, 2024

NikkiWines commented May 8, 2024

OSBotify commented May 9, 2024

NikkiWines commented Apr 3, 2024 •

edited

Loading

allroundexperts commented Apr 15, 2024 •

edited

Loading