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

fix: 30726 A blank spot appears after deleting a money request #31670

Merged
merged 17 commits into from
Dec 27, 2023

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Nov 22, 2023

Details

Fixed Issues

$ #30726
PROPOSAL: #30726 (comment)

Tests

  1. Request money manually form Fab menu
  2. Select user
  3. Add receipt
  4. Select from Gallery
  5. Complete request
  6. Open Request
  7. Select tree dot and select Delete Request
  8. Verify that NO blank spot appears after deleting a money request
  • Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

  1. Request money manually form Fab menu
  2. Select user
  3. Add receipt
  4. Select from Gallery
  5. Complete request
  6. Open Request
  7. Select tree dot and select Delete Request
  8. Verify that NO blank spot appears after deleting a money request
  • 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 / Chrome
    • iOS / native
    • iOS / 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 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 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 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
      • 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Screen.Recording.2023-11-22.at.15.48.16.mov
Android: mWeb Chrome
Screen.Recording.2023-11-22.at.15.16.48.mov
iOS: Native
Screen.Recording.2023-11-02.at.15.06.19.mov
iOS: mWeb Safari
Screen.Recording.2023-11-22.at.14.28.04.mov
MacOS: Chrome / Safari
Screen.Recording.2023-11-22.at.14.19.58.mp4
MacOS: Desktop
Screen.Recording.2023-11-22.at.14.24.46.mp4

@tienifr tienifr marked this pull request as ready for review November 22, 2023 07:30
@tienifr tienifr requested a review from a team as a code owner November 22, 2023 07:30
@melvin-bot melvin-bot bot requested review from shubham1206agra and removed request for a team November 22, 2023 07:30
Copy link

melvin-bot bot commented Nov 22, 2023

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

@shubham1206agra
Copy link
Contributor

Should we use

const previousLastIndex = useRef(sortedReportActions[0].reportActionID) // we can use useRef here

    useEffect(()=>{
        if(previousLastIndex.current !== sortedReportActions[0].reportActionID && reportActionSize.current > sortedReportActions.length){
            reportScrollManager.scrollToBottom()
        }
       previousLastIndex.current = sortedReportActions[0].reportActionID;
    }, [sortedReportActions[0].reportActionID])

@tienifr
Copy link
Contributor Author

tienifr commented Nov 22, 2023

@shubham1206agra Updated

@shubham1206agra
Copy link
Contributor

One last thing
Do we still need autoScrollToTopThreshold?

@shubham1206agra
Copy link
Contributor

Can you check if this doesn't break any other test defined #30461?

@tienifr
Copy link
Contributor Author

tienifr commented Nov 24, 2023

@shubham1206agra
If we apply this PR, these tests work well without autoScrollToTopThreshold

But we should not remove autoScrollToTopThreshold. autoScrollToTopThreshold is added into BaseInvertedFlatList and it's used in other places as well. I'm afraid that removing autoScrollToTopThreshold can cause the regressions

@shubham1206agra
Copy link
Contributor

@tienifr No other component is using InvertedFlatList. So I think its safe to remove this.

@tienifr
Copy link
Contributor Author

tienifr commented Nov 27, 2023

Agree with you, I just updated the PR

@shubham1206agra
Copy link
Contributor

Screen.Recording.2023-12-03.at.7.26.55.PM.mov

@tienifr Can you check this problem occuring on iOS native?

@tienifr
Copy link
Contributor Author

tienifr commented Dec 4, 2023

@shubham1206agra you mean the problem when the IOU preview is not present unless we scroll up and down?

@shubham1206agra
Copy link
Contributor

Both the original problem we are trying to solve and the one you mentioned just now

@tienifr
Copy link
Contributor Author

tienifr commented Dec 5, 2023

@shubham1206agra

  1. After removing autoscrollToTopThreshold we have to have the logic to scrollToBottom when the new message is coming, although we already have this logic here, but we don't wait for animation end so it does not work properly. To fix that we can wrap this function into actionManager.runAfterInteractions
  2. In here we hide the report action if it's pendingAction is delete (As the video I recorded before it show the skeleton but I don't know why it disappears for now), but the sortedReportAction still contains the pending deleted action so it takes more time for the actions is actually deleted. So I updated my PR a bit to filter out the deleted action

Result

Screen.Recording.2023-12-05.at.17.55.21.mov

@shubham1206agra
Copy link
Contributor

@tienifr Thanks for the update.
But I think it should show skeleton there when pending delete action is there.
Let me ask this in slack.

@shubham1206agra
Copy link
Contributor

shubham1206agra commented Dec 6, 2023

@tienifr In MoneyRequestPreview, we are not passing pendingAction, so how will here condition will be evaluated to true?
Can you point me to the line responsible for this behaviour?

@tienifr
Copy link
Contributor Author

tienifr commented Dec 7, 2023

@shubham1206agra We put the pendingAction here

pendingAction={props.draftMessage ? null : props.action.pendingAction}

@shubham1206agra
Copy link
Contributor

Can you tell me why skeleton was removed in #26939?

@shubham1206agra
Copy link
Contributor

@tienifr bump

@shubham1206agra
Copy link
Contributor

@tienifr Can you merge main here please?

@tienifr
Copy link
Contributor Author

tienifr commented Dec 18, 2023

merged

@shubham1206agra
Copy link
Contributor

@tienifr Can you fix the lint error here?

@shubham1206agra
Copy link
Contributor

@tienifr This will not work as reportActionSize never gets a new value

@tienifr
Copy link
Contributor Author

tienifr commented Dec 18, 2023

@shubham1206agra Yes, I just noticed that, I'm checking why it's removed

@tienifr
Copy link
Contributor Author

tienifr commented Dec 18, 2023

updated

@shubham1206agra
Copy link
Contributor

Screen.Recording.2023-12-19.at.1.14.41.PM.mov

@tienifr Attachment is not autoscrolling to end

@shubham1206agra
Copy link
Contributor

@shubham1206agra If we apply this PR, these tests work well without autoScrollToTopThreshold

But we should not remove autoScrollToTopThreshold. autoScrollToTopThreshold is added into BaseInvertedFlatList and it's used in other places as well. I'm afraid that removing autoScrollToTopThreshold can cause the regressions

Lets add this back in. Its creating problems beyond the scope of the PR.

@tienifr
Copy link
Contributor Author

tienifr commented Dec 20, 2023

@shubham1206agra updated

@tienifr
Copy link
Contributor Author

tienifr commented Dec 25, 2023

@shubham1206agra any updates?

@shubham1206agra
Copy link
Contributor

Sorry for the delay. I will finish this today

@shubham1206agra
Copy link
Contributor

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.

Screenshots/Videos

Android: Native
Screen.Recording.2023-12-26.at.6.15.40.PM.mp4
Android: mWeb Chrome
Screen.Recording.2023-12-26.at.6.39.20.PM.mov
iOS: Native
Screen.Recording.2023-12-26.at.5.51.48.PM.mov
iOS: mWeb Safari
Screen.Recording.2023-12-26.at.6.33.08.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2023-12-26.at.6.27.42.PM.mov
MacOS: Desktop
Screen.Recording.2023-12-26.at.6.41.59.PM.mov

@melvin-bot melvin-bot bot requested a review from rlinoz December 26, 2023 13:30
Comment on lines 276 to 278
InteractionManager.runAfterInteractions(() => {
reportScrollManager.scrollToBottom();
});
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we still need this change since we rolled back what caused the change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rlinoz After testing carefully, I realize that we don't need InteractionManager.runAfterInteractions anymore, so I just removed it. Thank you

@rlinoz rlinoz merged commit ad73595 into Expensify:main Dec 27, 2023
16 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.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.18-8 🚀

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

4 participants