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: three not found view #36409

Merged

Conversation

kosmydel
Copy link
Contributor

@kosmydel kosmydel commented Feb 13, 2024

Details

This PR adresses three things:

  • fixes multiple not found views,
  • fixes the back button,
  • refactors the WorkspaceMembersPage to use the WorkspacePageWithSections component.

Fixed Issues

$ #34234
$ #36266
PROPOSAL: N/A

Tests

Offline tests

N/A

QA Steps

  • Verify that no errors appear in the JS console
  • Do the above testing steps

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 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 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.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 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.

Screenshots/Videos

Android: Native
android-v2.mov
Android: mWeb Chrome
mweb-andorid-v2.mov
iOS: Native
ios-v2.mp4
iOS: mWeb Safari
mweb-ios-v2.mp4
MacOS: Chrome / Safari
web-v2.mov
button.fix.mov
MacOS: Desktop Screenshot 2024-02-19 at 10 45 58

@kosmydel kosmydel marked this pull request as ready for review February 19, 2024 09:53
@kosmydel kosmydel requested a review from a team as a code owner February 19, 2024 09:53
@melvin-bot melvin-bot bot requested review from shawnborton and thesahindia and removed request for a team February 19, 2024 09:53
Copy link

melvin-bot bot commented Feb 19, 2024

@shawnborton @thesahindia One of you needs to 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]

@kosmydel kosmydel marked this pull request as draft February 19, 2024 10:18
@kosmydel kosmydel force-pushed the @kosmydel/duplicated-not-found-view branch from dfa3ce7 to 39ecf1e Compare February 19, 2024 11:29
@kosmydel kosmydel marked this pull request as ready for review February 19, 2024 12:05
@shawnborton
Copy link
Contributor

Looks good to me, cc @trjExpensify @Expensify/design

@trjExpensify
Copy link
Contributor

Nice yeah, much better. On the first scenario where the RHP is open in the MacOS: Chrome / Safari video we do catch a glimpse of the modal sliding closed with the 404 being displayed. It's pretty fast though, so I'm not sure we need to worry about it too much.

@kosmydel
Copy link
Contributor Author

Nice yeah, much better. On the first scenario where the RHP is open in the MacOS: Chrome / Safari video we do catch a glimpse of the modal sliding closed with the 404 being displayed. It's pretty fast though, so I'm not sure we need to worry about it too much.

@trjExpensify I've noticed it too. During the navigation initialisation we don't know yet if the policy exists, so by the default, we mount the RHP. I just remove it after the Onyx initialises, when we got the full information. That's why we have this 'sliding' RHP.

@trjExpensify
Copy link
Contributor

@trjExpensify I've noticed it too. During the navigation initialisation we don't know yet if the policy exists, so by the default, we mount the RHP. I just remove it after the Onyx initialises, when we got the full information. That's why we have this 'sliding' RHP.

Yeah, got it.. and that sounds like something that would be hard to resolve, so I think I'm cool with it. 👍

@thesahindia
Copy link
Member

Planning to go OOO. Please reassign.

@situchan
Copy link
Contributor

I can take over.

There's conflict

@trjExpensify trjExpensify requested review from situchan and removed request for thesahindia February 23, 2024 18:41
@trjExpensify
Copy link
Contributor

@situchan assigned you. Please go ahead!

@situchan
Copy link
Contributor

situchan commented Feb 23, 2024

Thanks. @kosmydel please fix conflict when you get a chance

@Gonals
Copy link
Contributor

Gonals commented Apr 2, 2024

@kosmydel, can you answer @shawnborton's questions? We also seem to have some conflicts

@blazejkustra
Copy link
Contributor

@kosmydel is OOO today due to Easter, he should be able to answer and resolve conflicts tomorrow 😄

@kosmydel
Copy link
Contributor Author

kosmydel commented Apr 3, 2024

Hey, I've resolved the conflicts.

Where can I get the most up to date screenshots?

One thing that seemed weird to me was this particular screen from above
I would expect that not found view to just take up the whole screen and not just the LHN.

@shawnborton I wasn't able to reproduce that one. I'm assuming, that during the recording of the video, the central pane data was loaded a bit later than the LHN. I'm not sure about the reason, might be something Onyx-related.

Can you @situchan retest it to check if it still occurs for you?

@shawnborton
Copy link
Contributor

Friendly bump @situchan

@kosmydel
Copy link
Contributor Author

kosmydel commented Apr 8, 2024

Just a quick update from me:

I've found out that @hayata-suenaga is working on a higher-level approach to the visibility of screens in the workspaces. This might resolve this issue as well, and with those changes, we could use a more holistic approach than this one.

@hayata-suenaga
Copy link
Contributor

@kosmydel, we decided to delay implementing the proposed refactoring as we faced some issues. We don't know when or even if we're going to proceed with this refactoring. Meantime, it might be a good idea to go ahead with merging this PR to fix the issue 😄

@trjExpensify
Copy link
Contributor

@situchan is out for a month, so @Gonals if you're happy with the latest changes. Maybe we can merge this one?

@kosmydel
Copy link
Contributor Author

I've resolved conflicts and quickly tested. Before merging we should have another round of testing from C+ as the new architecture got merged.

What should we do with this PR as @situchan is OOO?

@Gonals
Copy link
Contributor

Gonals commented Apr 11, 2024

This tests well for me, so I think we can go ahead and merge

@Gonals Gonals merged commit 2c699e0 into Expensify:main Apr 11, 2024
15 checks passed
@kbecciv
Copy link

kbecciv commented Apr 18, 2024

@kosmydel Could you kindly update the QA steps to reflect the staging URL?

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/Gonals in version: 1.4.63-0 🚀

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

@kosmydel
Copy link
Contributor Author

@kosmydel Could you kindly update the QA steps to reflect the staging URL?

Done ✅

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.63-21 🚀

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

kosmydel added a commit to software-mansion-labs/expensify-app-fork that referenced this pull request May 6, 2024
@kosmydel kosmydel mentioned this pull request May 6, 2024
48 tasks
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.

10 participants