Revert "Revert 54064 and 53396" #54263

ishpaul777 · 2024-12-17T20:48:02Z

Explanation of Change

Fixed Issues

$ #53086
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Sign up with new Account (say Account A). Completed Onboarding flow
(On desktop, resize screen to mobile size) verify Tooltip on Concierge is displayed
Create a workpace, go back and open FAB menu, Verify that a tooltip on QAB is visibile
Go to search screen > Filters > Add and save a filter verify tooltip is shown on saved search threedot. (this is visible on desktop screen size only)
As another user create a workspace, invite this user A to the workspace
As user A go the invited workspace chat verify tooltip on "+" is shown.

Offline tests

QA Steps

Same as test 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: 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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…ctTraining

melvin-bot · 2024-12-18T20:02:56Z

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

ishpaul777 · 2024-12-18T20:04:05Z

this reverts the revert of my previous PR #54064 and #53396 currently on HOLD until we figure out the regression it potenitially caused is fixed

cc @rayane-djouah

MarioExpensify · 2024-12-19T15:28:21Z

Hey @rayane-djouah, as this is not a straight revert we'll need to review and do the checklist.

rayane-djouah · 2024-12-19T15:38:29Z

This is currently on HOLD until we figure out the regression it caused

rayane-djouah · 2024-12-19T15:38:54Z

@ishpaul777 Please see: https://expensify.slack.com/archives/C02NK2DQWUX/p1734562565220939

ishpaul777 · 2024-12-19T15:41:25Z

Yep i will set it up today re-test, but from a internal discussion i got to know that the regression was only happening on stag deployment was not reproducible on development

…ebar load state

ishpaul777 · 2024-12-23T18:34:10Z

src/components/FloatingActionButton.tsx

+    const platform = getPlatform();
+    const isNarrowScreenOnWeb = shouldUseNarrowLayout && platform === CONST.PLATFORM.WEB;
+    const isFocused = useBottomTabIsFocused();
+    const [isSidebarLoaded] = useOnyx(ONYXKEYS.IS_SIDEBAR_LOADED, {initialValue: false});


waiting till sidebar is loaded so we dont show the lower priority Fabbutton tooltip before the getStarted tooltip on conceirge chat..

ishpaul777 · 2024-12-23T18:36:22Z

@rayane-djouah I have confirmed that regression is not producabe for me at all, can you please retest and review this again?

Screen.Recording.2024-12-23.at.11.57.24.PM.mov

rayane-djouah · 2024-12-23T21:56:59Z

Screenshots/Videos

Android: Native

Screen.Recording.2024-12-23.at.11.23.06.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-12-23.at.9.43.16.PM.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-12-23.at.21.28.33.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-12-23.at.21.42.21.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-12-23.at.9.44.28.PM.mov

MacOS: Desktop

Screen.Recording.2024-12-23.at.10.54.35.PM.mov

rayane-djouah · 2024-12-23T22:12:57Z

The regression is not reproducabe for me also

rayane-djouah · 2024-12-23T22:14:53Z

~~I'm currently building android native app 🔄~~ Tested!

rayane-djouah · 2024-12-23T22:15:01Z

@ishpaul777 Could you please merge main branch and fix the Changed files ESLint check failing check?

ishpaul777 · 2024-12-24T12:58:05Z

merged main.

ishpaul777 · 2024-12-24T13:00:01Z

fix the Changed files ESLint check failing check?

hey changes in this PR is big, and we might have to revert if regression still occur on deployed app, lets keep this out of scope for now

rayane-djouah · 2024-12-24T13:09:32Z

I agree

rayane-djouah

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 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 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 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.ts 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 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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.2024-12-23.at.11.23.06.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-12-23.at.9.43.16.PM.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-12-23.at.21.28.33.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-12-23.at.21.42.21.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-12-23.at.9.44.28.PM.mov

MacOS: Desktop

Screen.Recording.2024-12-23.at.10.54.35.PM.mov

rayane-djouah · 2024-12-24T13:14:35Z

@puneetlath all yours!

ishpaul777 · 2024-12-24T18:09:59Z

resolved conflicts!

puneetlath · 2024-12-24T18:49:11Z

hey changes in this PR is big, and we might have to revert if regression still occur on deployed app, lets keep this out of scope for now

I agree with this reasoning. Going to go ahead and merge in spite of the failing ESLint test.

melvin-bot · 2024-12-24T18:49:27Z

@puneetlath looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

OSBotify · 2024-12-24T18:58:08Z

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

ishpaul777 and others added 6 commits December 18, 2024 02:17

Revert "Revert 54064 and 53396"

9111a2c

Merge branch 'main' into revert-54260-revert-54064-and-53396

5138fed

formatting

aa00cd5

fix warning

dcb8e79

refactor: change timestamp type from Date to string in DismissedProdu…

e9e3c21

…ctTraining

Merge branch 'Expensify:main' into revert-54260-revert-54064-and-53396

caa87c2

ishpaul777 marked this pull request as ready for review December 18, 2024 20:02

ishpaul777 requested review from a team as code owners December 18, 2024 20:02

melvin-bot bot requested review from MarioExpensify and removed request for a team December 18, 2024 20:02

MarioExpensify requested a review from rayane-djouah December 19, 2024 15:26

puneetlath self-requested a review December 19, 2024 15:50

Merge branch 'main' into revert-54260-revert-54064-and-53396

599d5d6

ishpaul777 mentioned this pull request Dec 20, 2024

[$500] Make it possible to click the element the product training tooltip is pointing to. #54068

Open

ishpaul777 and others added 4 commits December 20, 2024 22:43

Merge branch 'main' into revert-54260-revert-54064-and-53396

3db3ba6

remove unused variable

805446f

Merge branch 'Expensify:main' into revert-54260-revert-54064-and-53396

c3446bd

FloatingActionButton logic to conditionally show tooltip based on sid…

0e97038

…ebar load state

ishpaul777 commented Dec 23, 2024

View reviewed changes

Merge branch 'main' into revert-54260-revert-54064-and-53396

d288477

rayane-djouah approved these changes Dec 24, 2024

View reviewed changes

Merge branch 'main' into revert-54260-revert-54064-and-53396

8fca124

puneetlath approved these changes Dec 24, 2024

View reviewed changes

puneetlath merged commit de1b888 into Expensify:main Dec 24, 2024
15 of 16 checks passed

melvin-bot bot added the Emergency label Dec 24, 2024

puneetlath removed the Emergency label Dec 24, 2024

linhvovan29546 mentioned this pull request Dec 25, 2024

fix: android native tooltip appears broken #54550

Open

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert "Revert 54064 and 53396" #54263

Revert "Revert 54064 and 53396" #54263

ishpaul777 commented Dec 17, 2024 •

edited

Loading

melvin-bot bot commented Dec 18, 2024

ishpaul777 commented Dec 18, 2024 •

edited

Loading

MarioExpensify commented Dec 19, 2024

rayane-djouah commented Dec 19, 2024

rayane-djouah commented Dec 19, 2024

ishpaul777 commented Dec 19, 2024

ishpaul777 Dec 23, 2024

ishpaul777 commented Dec 23, 2024

rayane-djouah commented Dec 23, 2024 •

edited

Loading

rayane-djouah commented Dec 23, 2024

rayane-djouah commented Dec 23, 2024 •

edited

Loading

rayane-djouah commented Dec 23, 2024

ishpaul777 commented Dec 24, 2024

ishpaul777 commented Dec 24, 2024

rayane-djouah commented Dec 24, 2024

rayane-djouah left a comment •

edited

Loading

rayane-djouah commented Dec 24, 2024

ishpaul777 commented Dec 24, 2024

puneetlath commented Dec 24, 2024 •

edited

Loading

melvin-bot bot commented Dec 24, 2024

OSBotify commented Dec 24, 2024

Revert "Revert 54064 and 53396" #54263

Revert "Revert 54064 and 53396" #54263

Conversation

ishpaul777 commented Dec 17, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 18, 2024

ishpaul777 commented Dec 18, 2024 • edited Loading

MarioExpensify commented Dec 19, 2024

rayane-djouah commented Dec 19, 2024

rayane-djouah commented Dec 19, 2024

ishpaul777 commented Dec 19, 2024

ishpaul777 Dec 23, 2024

Choose a reason for hiding this comment

ishpaul777 commented Dec 23, 2024

rayane-djouah commented Dec 23, 2024 • edited Loading

Screenshots/Videos

rayane-djouah commented Dec 23, 2024

rayane-djouah commented Dec 23, 2024 • edited Loading

rayane-djouah commented Dec 23, 2024

ishpaul777 commented Dec 24, 2024

ishpaul777 commented Dec 24, 2024

rayane-djouah commented Dec 24, 2024

rayane-djouah left a comment • edited Loading

Choose a reason for hiding this comment

Reviewer Checklist

Screenshots/Videos

rayane-djouah commented Dec 24, 2024

ishpaul777 commented Dec 24, 2024

puneetlath commented Dec 24, 2024 • edited Loading

melvin-bot bot commented Dec 24, 2024

OSBotify commented Dec 24, 2024

ishpaul777 commented Dec 17, 2024 •

edited

Loading

ishpaul777 commented Dec 18, 2024 •

edited

Loading

rayane-djouah commented Dec 23, 2024 •

edited

Loading

rayane-djouah commented Dec 23, 2024 •

edited

Loading

rayane-djouah left a comment •

edited

Loading

puneetlath commented Dec 24, 2024 •

edited

Loading