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

Improve goBack function #26498

Merged

Conversation

adamgrzybowski
Copy link
Contributor

@adamgrzybowski adamgrzybowski commented Sep 1, 2023

Details

This PR improves goBack function so the fallback could be used for reports screens. Additionally, it allows to goBack with more than one route for report screens when using a fallback route

Fixed Issues

$ #26569
PROPOSAL:

Tests

  1. Open a chat with somebody
  2. Request money
  3. Open the request money report
  4. Delete request
  5. Go back
  6. Make sure that you are not on the "not found" page
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
web.mov
Mobile Web - Chrome
androidWeb.mov
Mobile Web - Safari
iosWeb.mov
Desktop
desktop.mov
iOS
ios.mov
Android
android.mov

@melvin-bot
Copy link

melvin-bot bot commented Sep 4, 2023

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

@mountiny mountiny changed the title Improve goBack function [HOLD freeze] Improve goBack function Sep 4, 2023
@mountiny
Copy link
Contributor

mountiny commented Sep 4, 2023

@sobitneupane putting it on hold but please continue with a review and testing please thanks!

@OSBotify
Copy link
Contributor

OSBotify commented Sep 4, 2023

🧪🧪 Use the links below to test this build in android and iOS. Happy testing! 🧪🧪

android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/26498/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/26498/index.html
Android iOS
desktop 💻 web 🕸️
❌ FAILED ❌ ❌ FAILED ❌
The QR code can't be generated, because the Desktop build failed The QR code can't be generated, because the web build failed

@ShogunFire
Copy link
Contributor

Hello, are you close to merging this ?

@mountiny mountiny changed the title [HOLD freeze] Improve goBack function Improve goBack function Sep 22, 2023
@mountiny
Copy link
Contributor

@adamgrzybowski can you please resolve conflicts on this one?

@mountiny
Copy link
Contributor

@adamgrzybowski bump on the conflicts

@adamgrzybowski adamgrzybowski force-pushed the @swm/improve-goBack-with-fallback-route branch from 3efefd9 to 0644669 Compare September 25, 2023 11:28
@adamgrzybowski
Copy link
Contributor Author

@mountiny done! Thanks for the bump 😄 I completely forgot

@adamgrzybowski adamgrzybowski force-pushed the @swm/improve-goBack-with-fallback-route branch from 6926e71 to 881dc84 Compare September 25, 2023 11:59
@mountiny
Copy link
Contributor

@adamgrzybowski jest units failing now, maybe we need to merge main again 🤔

@adamgrzybowski
Copy link
Contributor Author

@mountiny merging main and small adjustments in tests helped. Thanks for noticing the problem! 🙇

@mountiny
Copy link
Contributor

@sobitneupane can you please do the checklist today?

@sobitneupane
Copy link
Contributor

Yes @mountiny. I will review the PR today.

@mountiny
Copy link
Contributor

mountiny commented Nov 9, 2023

Could you please merge main into the branch to hoopefully resolve the reassure tests

@mountiny
Copy link
Contributor

@s77rt What is the latest on the bug, what was the resolution on the Pr you ave linked?

@WojtekBoman lets merge main again since the reassure tests has been fixed there

@s77rt
Copy link
Contributor

s77rt commented Nov 10, 2023

The bug is due to the use of maintainVisibleContentPosition. We had a similar issue #30423 that was fixed by #30461. It seems that we need to adjust the value of maintainVisibleContentPosition.autoScrollToTopThreshold once again but not sure what value should we use. It may be easier to handle this bug separately and merge this PR (and remove the scroll hack)

@WojtekBoman
Copy link
Contributor

I removed this hook from ReportActionsList file

@mountiny
Copy link
Contributor

@s77rt could you please retest

@s77rt
Copy link
Contributor

s77rt commented Nov 10, 2023

@mountiny Just did. Still working as expected but the bug on iOS is still present. Should we create a new issue for that bug?

@mountiny
Copy link
Contributor

I am partial on this one, the bug seems to be new, it does not happen in such manner in main, right?

@s77rt
Copy link
Contributor

s77rt commented Nov 10, 2023

After checking further more I think we can adjust the value in this PR and fix the bug.

maintainVisibleContentPosition.autoscrollToTopThreshold sets the threshold that if the user scrolls beyond that position the auto scroll won't work. Currently it's 64px (variables.listItemHeightNormal) which means if user scrolls or if the height is changed by anything over 64px then the auto scroll won't work. In our case we delete the IOU preview which is 123px in height.

I don't know how we ended up choosing 64px (cc @roryabraham) but it seems too low. Let's create a new variable and set it to 128px. That should do it.

@s77rt
Copy link
Contributor

s77rt commented Nov 13, 2023

@WojtekBoman Thanks! This is looking good for me

@s77rt
Copy link
Contributor

s77rt commented Nov 13, 2023

@mountiny Let's merge this 🚀

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.

Thanks, I am approving but i would love to see @roryabraham opinion on this before merging

Copy link
Contributor

@roryabraham roryabraham left a comment

Choose a reason for hiding this comment

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

Currently [maintainVisibleContentPosition.autoScrollToTopThreshold is] 64px ...

This was chosen as it's the normal height of a ReportActionItemSingle. When it was added there was a bug when Uploading attachment... was replaced by the image thumbnail. 64px was just enough to fix that bug, and there wasn't any bug with sending IOU requests as far as I remember.

Increasing the autoScrollToTopThreshold to a higher value seems fine to me. But it's not really a perfect solution. ReportActionItem components have non-deterministic height, so if you choose any value, I can write you a message that's taller and if you delete it the same bug will be reproducible. So maybe we could look for a better solution. You don't want to autoScrollToTop if the reportAction in question (at the bottom) is not even visible on the screen. So maybe a reasonable value for autoScrollToTopThreshold is the height of the screen?

@mountiny
Copy link
Contributor

Thank you!

So maybe a reasonable value for autoScrollToTopThreshold is the height of the screen?

Given the explanation I think this makes sense, this would have to be dynamic then. @s77rt @WojtekBoman Lets try this out and test if there are any regressions from it. I hink that can be handled in a separate PR though, do you guys agree?

@s77rt
Copy link
Contributor

s77rt commented Nov 13, 2023

Handling this in a separate PR sounds good

@mountiny
Copy link
Contributor

@s77rt ddi you retest after the latest change?

@s77rt
Copy link
Contributor

s77rt commented Nov 13, 2023

@mountiny Yes (the 128px change - not the height-screen change)

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.

Thanks guys! Lets be on a look out for any regressions in the go back logic

@mountiny mountiny merged commit 2033420 into Expensify:main Nov 13, 2023
15 of 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 staging by https://github.com/mountiny in version: 1.3.99-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.99-0 🚀

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

@OSBotify
Copy link
Contributor

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

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

@@ -4,7 +4,8 @@ import {FlatList as NativeFlatlist, View} from 'react-native';
import _ from 'underscore';
import FlatList from '@components/FlatList';
import * as CollectionUtils from '@libs/CollectionUtils';
import variables from '@styles/variables';

const AUTOSCROLL_TO_TOP_THRESHOLD = 128;
Copy link
Contributor

Choose a reason for hiding this comment

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

This PR forgot to cover an extra case. More details here #30726

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

Successfully merging this pull request may close these issues.

9 participants