Skip to content

Revert tab leader PRs#458

Merged
NikkiWines merged 7 commits intoExpensify:mainfrom
margelo:@chrispader/revert-tab-leader-prs
Jan 23, 2024
Merged

Revert tab leader PRs#458
NikkiWines merged 7 commits intoExpensify:mainfrom
margelo:@chrispader/revert-tab-leader-prs

Conversation

@chrispader
Copy link
Copy Markdown
Contributor

@chrispader chrispader commented Jan 23, 2024 •
edited
Loading

@koko57 @roryabraham @mountiny

Details

Reverts #382 and #434 so that we can bump Onyx in E/App.

Once the issues with this functionality are resolved, we can re-apply these PRs

Related Issues

#455 (comment)

Automated Tests

Manual Tests

Author Checklist

  • I linked the correct issue in the ### Related 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 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 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 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 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

Screenshot_20240123_164314_New Expensify Dev

Android: mWeb Chrome
iOS: Native

Simulator Screenshot - iPhone 15 Pro - 2024-01-23 at 16 42 22

iOS: mWeb Safari
MacOS: Chrome / Safari Screenshot 2024-01-23 at 16 40 03
MacOS: Desktop

Tested on web, iOS and Android.

Christoph Pader added 2 commits January 23, 2024 15:36
Revert "Merge pull request Expensify#434 from koko57/feat/tab_leader_…
c6a8377 
…write_fix"

This reverts commit 0aeae07, reversing
changes made to cc43294.
Revert "Merge pull request Expensify#382 from BeeMargarida/feat/tab_l…
fc18ba6 
…eader_write"

This reverts commit d858361, reversing
changes made to d76bed7.
@chrispader chrispader marked this pull request as ready for review January 23, 2024 14:46
@chrispader chrispader requested a review from a team as a code owner January 23, 2024 14:46
@melvin-bot melvin-bot bot requested review from NikkiWines and removed request for a team January 23, 2024 14:47
@mountiny
Copy link
Copy Markdown
Contributor

mountiny commented Jan 23, 2024

@chrispader was this a clean revert for both PRs?

@chrispader chrispader mentioned this pull request Jan 23, 2024
Merged
50 tasks
@chrispader
Copy link
Copy Markdown
Contributor Author

chrispader commented Jan 23, 2024

@chrispader was this a clean revert for both PRs?

no, there were conflicts due to the later PRs. I'm currently checking if anything got messed up

@chrispader chrispader mentioned this pull request Jan 23, 2024
Closed
6 tasks
@chrispader
Copy link
Copy Markdown
Contributor Author

chrispader commented Jan 23, 2024 •
edited
Loading

@mountiny this PR should be ready now. Accidentally removed a call to DevTools.clearState which caused the tests to fail.

mountiny
mountiny approved these changes Jan 23, 2024
View reviewed changes
Copy link
Copy Markdown
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.

@chrispader looking good, I think we can keep the screenshots in the App Pr when testing the Onyx bump since this is just a revert

@NikkiWines all yours

@chrispader
Copy link
Copy Markdown
Contributor Author

chrispader commented Jan 23, 2024

@chrispader looking good, I think we can keep the screenshots in the App Pr when testing the Onyx bump since this is just a revert

Great! added screenshots and tested on web, iOS and Android anyway.

@chrispader chrispader mentioned this pull request Jan 23, 2024
Merged
42 tasks
NikkiWines
NikkiWines approved these changes Jan 23, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@NikkiWines NikkiWines left a comment

Choose a reason for hiding this comment

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

:shipit:

@NikkiWines NikkiWines merged commit 54aeadc into Expensify:main Jan 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NikkiWines NikkiWines NikkiWines approved these changes

@mountiny mountiny mountiny approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@chrispader @mountiny @NikkiWines