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

Add back some HybridApp logic after TS migration to fix authentication #36750

Merged
merged 16 commits into from
Mar 19, 2024

Conversation

AndrewGable
Copy link
Contributor

@AndrewGable AndrewGable commented Feb 17, 2024

Details

Adds back some logic that was removed in #34777 while migrating this page to TypeScript. This code is needed to run HybridApp

Fixed Issues

$ #36717

Tests

  1. Build HybridApp
  2. Verify going from Expensify Classic to New Expensify works

Offline tests

N/A

QA Steps

N/A

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

Screenshots/Videos

hybrid.mov

@AndrewGable AndrewGable changed the title Add back some HybridApp logic after TS migration to fix Authentication Add back some HybridApp logic after TS migration to fix authentication Feb 17, 2024
@AndrewGable AndrewGable marked this pull request as ready for review February 17, 2024 01:25
@AndrewGable AndrewGable requested a review from a team as a code owner February 17, 2024 01:25
@melvin-bot melvin-bot bot removed the request for review from a team February 17, 2024 01:25
Copy link

melvin-bot bot commented Feb 17, 2024

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

@AndrewGable AndrewGable self-assigned this Feb 17, 2024
src/pages/LogOutPreviousUserPage.tsx Outdated Show resolved Hide resolved
src/pages/LogOutPreviousUserPage.tsx Outdated Show resolved Hide resolved
src/pages/LogOutPreviousUserPage.tsx Outdated Show resolved Hide resolved
src/pages/LogOutPreviousUserPage.tsx Outdated Show resolved Hide resolved
@mananjadhav
Copy link
Collaborator

@roryabraham @AndrewGable Does this need C+ review?

Copy link
Collaborator

@mananjadhav mananjadhav left a comment

Choose a reason for hiding this comment

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

Minor comments.

src/pages/LogOutPreviousUserPage.tsx Outdated Show resolved Hide resolved
src/pages/LogOutPreviousUserPage.tsx Outdated Show resolved Hide resolved
@AndrewGable
Copy link
Contributor Author

Forgot this wasn't merged yet, I will reply to comments next week

AndrewGable and others added 2 commits March 1, 2024 11:39
Co-authored-by: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Co-authored-by: Manan <manan.jadhav@gmail.com>
@roryabraham roryabraham changed the title Add back some HybridApp logic after TS migration to fix authentication [WIP] Add back some HybridApp logic after TS migration to fix authentication Mar 12, 2024
@AndrewGable AndrewGable changed the title [WIP] Add back some HybridApp logic after TS migration to fix authentication Add back some HybridApp logic after TS migration to fix authentication Mar 15, 2024
@AndrewGable
Copy link
Contributor Author

Merged main, all review comments are addressed, please give this a new review.

I've re-tested and it's working as expected after 9e5aa9d.

Untitled.mp4

@roryabraham
Copy link
Contributor

Hmmm when I added isAccountLoading there I saw an infinite loop. Maybe I had something misconfigured?

@AndrewGable
Copy link
Contributor Author

Maybe - Can you try testing it again and see if you get the same results as the screen recording?

@roryabraham
Copy link
Contributor

@AndrewGable upon retesting this I landed here:

image

@roryabraham
Copy link
Contributor

After uninstalling the app and reinstalling, it worked as expected. I think this is safe to merge and doesn't make anything worse, but I don't know if this worked with expired authTokens.

@AndrewGable
Copy link
Contributor Author

I can do some further real world testing once we merge and get a new version out 👍

@roryabraham
Copy link
Contributor

Tested with an authToken that expires after 5s, and still this seems to be working correctly. Going to merge this.

@roryabraham roryabraham merged commit 888aaab into main Mar 19, 2024
14 of 16 checks passed
@roryabraham roryabraham deleted the andrew-fix-hybrid branch March 19, 2024 17:02
@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/roryabraham in version: 1.4.55-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.55-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.55-3 🚀

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


// We only want to run this effect once on mount (when the page first loads after transitioning from OldDot)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
}, [initialURL, isAccountLoading]);
Copy link
Contributor

Choose a reason for hiding this comment

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

This useEffect runs continuously because isAccountLoading is set to true in signInWithShortLivedAuthToken and caused this issue #39831

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.

5 participants