Followup/23961 edit request headers #25399

koko57 · 2023-08-17T13:58:44Z

Details

improved the optimistic styles when the transaction is changed offline
improves the modified message text when there was no value set before

Fixed Issues

$ #23961
PROPOSAL: $ #23961

Tests

Offline styles:

Go to request details
Go offline
Verify that the amount, date and description menu items are greyed out but still clickable.

Modified expense message

Change the date, amount, the description (then once again to empty string).
Verify that messages are using this schema:

no old value: set the [valueName] to [newValue]
no new value: removed the [valueName] (previously [oldValue])
old and new value changed the [valueName] to [newValue] (previously [oldValue])
Verify that no errors appear in the JS console

Offline tests

Offline styles:

Go to request details
Go offline
Verify that the amount, date and description menu items are greyed out but still clickable.

Modified expense message

Change the date, amount, the description (then once again to an empty string).
Verify that messages are using this schema:

no old value: set the [valueName] to [newValue]
no new value: removed the [valueName] (previously [oldValue])
old and new value changed the [valueName] to [newValue] (previously [oldValue])

QA Steps

Offline styles:

Go to request details
Go offline
Verify that the amount, date and description menu items are greyed out but still clickable.

Modified expense message

Change the date, amount, the description (then once again to an empty string).
Verify that messages are using this schema:

no old value: set the [valueName] to [newValue]
no new value: removed the [valueName] (previously [oldValue])
old and new value changed the [valueName] to [newValue] (previously [oldValue])
Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

koko57 · 2023-08-17T17:54:57Z

Still not solved: after updating values when offline the headers (amount, description, date) don't change immediately - they change after changing other values or refocusing the screen.

Could it be possibly because we're updating only the transaction object and the transaction data is not taken directly from Onyx? The keys we're subscribing to are not changing.

melvin-bot · 2023-08-17T18:23:25Z

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

allroundexperts · 2023-08-17T18:24:48Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

Screen.Recording.2023-08-21.at.2.31.49.PM.mov

Mobile Web - Chrome

Screen.Recording.2023-08-21.at.2.35.54.PM.mov

Mobile Web - Safari

Screen.Recording.2023-08-21.at.2.38.31.PM.mov

Desktop

Screen.Recording.2023-08-21.at.2.33.37.PM.mov

iOS

Screen.Recording.2023-08-21.at.2.40.01.PM.mov

Android

Screen.Recording.2023-08-21.at.2.37.34.PM.mov

allroundexperts

Code is looking fine to me. Testing now!

allroundexperts · 2023-08-17T19:40:23Z

@koko57 Should I wait for this to be resolved? Or will this be fixed in another followup? cc @mountiny If you know.

koko57 · 2023-08-17T19:54:37Z

@allroundexperts I think it can be fixed in another follow-up.

allroundexperts · 2023-08-17T19:55:23Z

Sounds good. Continuing my testing then!

mountiny · 2023-08-17T20:00:47Z

I think we could pull the transaction directly from onyx on the component to ensure it rerenders whenever it changes

src/libs/ReportUtils.js

allroundexperts · 2023-08-17T20:35:24Z

Looking good. At this point, only waiting for the android build to complete so I can add its screenshots (its painfully slow lately).

allroundexperts

Finally android build is complete and so is the checklist.

One final comment. On tasks, we are greying out title / description / assignee only when you're offline and someone changes it. On the contrary, here, we are greying it out regardless if someone has edited it out or not. I'm not sure which behaviour is the correct one but we should be consistent between screens.

mountiny · 2023-08-17T21:35:48Z

Noting that Carlos is adding the transaction subscriber to the money request view here https://github.com/Expensify/App/pull/25435/files

@allroundexperts @koko57 Thanks for highlighting this, we might not have ben clear, when offline the header should be grey only when you edit it as that symbols the change is optimistic, ie only at your client locally.

It should not be grey just because you are offline.

allroundexperts · 2023-08-17T21:37:39Z

It should not be grey just because you are offline.

Right. @koko57 You might want to update the PR to handle this then. Also, please update your test steps and I'll review it again!

koko57 · 2023-08-18T04:29:41Z

@allroundexperts @mountiny thanks for the review! I'm OOO from today, someone from my team will take it over. Seems that Carlos PR will solve the updating the headers issue here, so the only thing to do is to apply greying out only to edited headers 🙂 I guess that the changes that Carlos made will also be necessary to do that, so we'll probably need to wait for this PR to be merged

BeeMargarida · 2023-08-18T09:34:52Z

Hey, I'll be picking this up while Agata is OOO. I'll get up to speed on this and work on applying the greying out on the edited headers.

BeeMargarida · 2023-08-18T11:02:10Z

@allroundexperts @mountiny I've updated the greying out logic, let me know if there's any error or misunderstanding on my part. It should now be working similar to the Task view. This is still dependent on Carlos PR for the re-render of the component when the transaction changes.

mountiny · 2023-08-18T11:55:21Z

@allroundexperts also shoul be ready once you get time thanks

allroundexperts · 2023-08-18T13:00:31Z

@mountiny Blocked on it because of https://expensify.slack.com/archives/C049HHMV9SM/p1692362128396259

allroundexperts · 2023-08-18T15:26:21Z

BUG

Go offline.
Create a new money request.
Go to the created money request details page.

The amount / description / date should be greyed out since the request was created while being offline but it is not.

allroundexperts · 2023-08-18T15:31:18Z

@BeeMargarida Also, when I edit a request, it becomes greyed out only AFTER I re-focus the tab. Is that expected?

BeeMargarida · 2023-08-18T15:34:36Z

@BeeMargarida Also, when I edit a request, it becomes greyed out only AFTER I re-focus the tab. Is that expected?

I think that's related to the fact that this is dependent on Carlos PR, which re-renders the component when the transaction changes. Currently this is not happening.

allroundexperts · 2023-08-18T15:36:06Z

Makes sense. Please let me know once this is fixed and I'll re-review.

BeeMargarida · 2023-08-18T15:42:33Z

@allroundexperts Should be fixed now 👍

allroundexperts · 2023-08-18T15:50:21Z

@BeeMargarida Conflicts 🤯 🤯

BeeMargarida · 2023-08-18T16:03:47Z

@allroundexperts Fixed 👍

allroundexperts · 2023-08-21T09:56:12Z

Tests well. Updated the screen recordings.

allroundexperts

Looks good!

mountiny

Thanks everyone, really helpful!

OSBotify · 2023-08-21T10:57:58Z

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

OSBotify · 2023-08-21T22:23:37Z

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

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

roryabraham · 2023-08-23T20:22:04Z

#25399 - Failing #22640

@mvtglobally Applause reported this as a QA fail. Not a deploy blocker, but can you provide some more details please?

OSBotify · 2023-08-24T03:06:38Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.56-24 🚀

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

cubuspl42 · 2023-10-06T10:53:15Z

src/components/ReportActionItem/MoneyRequestView.js

-                shouldShowRightIcon={canEdit}
-                onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))}
-            />
+            <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.amount') || lodashGet(transaction, 'pendingAction')}>


Coming from #26235

When adding this, we didn't take into consideration that MoneyRequestView itself is wrapped in <OfflineWithFeedback>, which can lead to a cumulated grey-out effect.

Yeah, but in the same commit wrapping the whole component was removed. So it looks like it was restored later and caused the issue

I missed that! Thank you, I'll update my checklist.

Found it: https://github.com/Expensify/App/pull/24235/files#r1348589086

koko57 added 4 commits August 17, 2023 09:04

feat: grey out the headers as soon as the user goes offline

206eb2b

feat: create a function for getting a proper message schema

2d25488

Merge branch 'main' into followup/23961-edit-request-headers

03b3836

fix: remove request word from the message

f776dc5

koko57 marked this pull request as ready for review August 17, 2023 18:23

koko57 requested a review from a team as a code owner August 17, 2023 18:23

melvin-bot bot removed the request for review from a team August 17, 2023 18:23

melvin-bot bot requested a review from allroundexperts August 17, 2023 18:23

allroundexperts reviewed Aug 17, 2023

View reviewed changes

mountiny assigned koko57 Aug 17, 2023

mountiny self-requested a review August 17, 2023 20:01

allroundexperts reviewed Aug 17, 2023

View reviewed changes

src/libs/ReportUtils.js Show resolved Hide resolved

allroundexperts approved these changes Aug 17, 2023

View reviewed changes

feat: only grey out updated fields

782ae85

fix: grey out when pendingAction is ADD

54cb2c4

Merge branch 'main' into followup/23961-edit-request-headers

860e2f4

allroundexperts approved these changes Aug 21, 2023

View reviewed changes

mountiny approved these changes Aug 21, 2023

View reviewed changes

mountiny merged commit 49d42a9 into Expensify:main Aug 21, 2023
15 checks passed

OSBotify mentioned this pull request Aug 21, 2023

Deploy Checklist: New Expensify 2023-08-21 #25625

Closed

koko57 deleted the followup/23961-edit-request-headers branch September 28, 2023 15:54

allroundexperts mentioned this pull request Sep 29, 2023

[$500] [HOLD for payment 2023-09-29] Follow ups to the Edit Money Request #23961

Closed

13 tasks

cubuspl42 reviewed Oct 6, 2023

View reviewed changes

This was referenced Oct 6, 2023

[HOLD for payment 2023-10-09] [$500] IOU - Content in IOU thread and details page has different shade of gray when created offline #26235

Closed

Display receipts in chat #24235

Merged

Followup/23961 edit request headers #25399

Followup/23961 edit request headers #25399

Conversation

koko57 commented Aug 17, 2023 • edited by mountiny Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

koko57 commented Aug 17, 2023

melvin-bot bot commented Aug 17, 2023

allroundexperts commented Aug 17, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

allroundexperts left a comment

Choose a reason for hiding this comment

allroundexperts commented Aug 17, 2023

koko57 commented Aug 17, 2023 • edited Loading

allroundexperts commented Aug 17, 2023

mountiny commented Aug 17, 2023

allroundexperts commented Aug 17, 2023

allroundexperts left a comment • edited Loading

Choose a reason for hiding this comment

mountiny commented Aug 17, 2023

allroundexperts commented Aug 17, 2023

koko57 commented Aug 18, 2023 • edited Loading

BeeMargarida commented Aug 18, 2023

BeeMargarida commented Aug 18, 2023 • edited Loading

mountiny commented Aug 18, 2023

allroundexperts commented Aug 18, 2023

allroundexperts commented Aug 18, 2023

allroundexperts commented Aug 18, 2023

BeeMargarida commented Aug 18, 2023

allroundexperts commented Aug 18, 2023

BeeMargarida commented Aug 18, 2023

allroundexperts commented Aug 18, 2023

BeeMargarida commented Aug 18, 2023

allroundexperts commented Aug 21, 2023

allroundexperts left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 21, 2023

OSBotify commented Aug 21, 2023

roryabraham commented Aug 23, 2023

OSBotify commented Aug 24, 2023

cubuspl42 Oct 6, 2023

Choose a reason for hiding this comment

koko57 Oct 6, 2023

Choose a reason for hiding this comment

cubuspl42 Oct 6, 2023

Choose a reason for hiding this comment

cubuspl42 Oct 6, 2023

Choose a reason for hiding this comment

koko57 commented Aug 17, 2023 •

edited by mountiny

Loading

allroundexperts commented Aug 17, 2023 •

edited

Loading

koko57 commented Aug 17, 2023 •

edited

Loading

allroundexperts left a comment •

edited

Loading

koko57 commented Aug 18, 2023 •

edited

Loading

BeeMargarida commented Aug 18, 2023 •

edited

Loading