Skip to content

Bring back new SignInPage#65178

Merged
Julesssss merged 50 commits intoExpensify:mainfrom
software-mansion-labs:fix-reload-on-new-sign-in-page
Jul 31, 2025
Merged

Bring back new SignInPage#65178
Julesssss merged 50 commits intoExpensify:mainfrom
software-mansion-labs:fix-reload-on-new-sign-in-page

Conversation

@mateuuszzzzz
Copy link
Contributor

@mateuuszzzzz mateuuszzzzz commented Jun 30, 2025

Explanation of Change

Fixed Issues

$ #49844

MOBILE-EXPENSIFY: https://github.com/Expensify/Mobile-Expensify/pull/13607#pullrequestreview-2972319319

Tests

Please thoroughly test these cases, these changes have far reaching changes to authentication.

Base information to every flow:

Redirection tests apply to HybridApp, for web you should remain on the current URL

The flow is based on NVP tryNewDot value, we have two possible scenarios to test

  • tryNewDot is properly set
  1. Log out from ND
  2. Log in using any flows bellow
  3. Verify that you end up in ND (dismissed == false)
  4. Move to OD using Switch to Expensify Classic button
  5. Log out from OD
  6. Verify that you end up in ND sign in page and the transition is seamless (no bootsplash and no white screen)
  7. Log in with the same account
  8. Verify you end up in OD (dismissed == true)
  • tryNewDot is undefined. This state can be achieved by having old classic account or manually setting await NVP.set("tryNewDot", undefined); in Expenisfy classic on web.
  1. Open app
  2. Try to log in using preset account described above and any flow
  3. Verify that you user is moved straight to OD and Try New Expensify button is no visible
  4. Log out
  5. Verify that you end up in ND sign in page and the transition is seamless (no bootsplash and no white screen)

Main flow:

  1. Provide email
  2. Enter magic code

Main flow new Account:

  1. Provide new email
  2. Press Join
  3. Verify that onboarding starts
  4. Verify that onboarding cannot be dismissed by pressing hardware back button.

SAML Magic code

  1. Provide email that uses SAML
  2. Press Use magic code
  3. Enter magic code

SAML single sign on

  1. Provide email that uses SAML
  2. Press single sign-on
  3. Login via SAML
  4. Verify that app opens properly and not inside WebView

Domain-based login flow test

  1. Log in using an email with the public domain.
  2. Verify that users are able to sign in
  3. Log in using an email with a private domain.
  4. Verify that users are able to log in

Google sign-in Apple sign-in:

  • Both flows have different implementation depending on OS and need to be tested exhaustively
  • Verify that no errors or Growls appear.

2FA:

  1. Log in to ND.
  2. Add 2FA to the account
  3. Sign out
  4. Login again using the authenticator app

Travel, OD <-> ND switch etc
Verify that:

  1. Travel from OD work according to [HybridApp] Allow classic experience users to use NewDot travel page #49602 (comment)
  2. After sign-in ND share extension works properly
  3. That changing copilot in OD/ND changes copilot in other app.
  4. When changing copilot in ND no navigation happens
  5. User with tryNewDot can transition between OD and ND.
  6. Deeplinks navigate to appropriate app depending on the link
  7. Verify that shortcuts work and navigate to app depending on where user is logged.

In addition, please run through the new test cases that were previously created for this feature.

Offline tests

N/A

QA Steps

  • Run the above tests
  • InternalQA- also run the above tests

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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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.mov
Android: mWeb Chrome
iOS: Native
ScreenRecording_07-02-2025.12-12-07_1.MP4
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@github-actions
Copy link
Contributor

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

@mateuuszzzzz
Copy link
Contributor Author

Diff will get better once we merge #64786

Copy link
Contributor

@Julesssss Julesssss left a comment

Choose a reason for hiding this comment

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

Holding on wider HybridApp signin changes

@Julesssss
Copy link
Contributor

Hey @mateuuszzzzz could you merge main please as we have merged the sign in changes now.

@mateuuszzzzz mateuuszzzzz marked this pull request as ready for review July 2, 2025 10:21
@mateuuszzzzz mateuuszzzzz requested a review from a team as a code owner July 2, 2025 10:21
@melvin-bot melvin-bot bot requested a review from JS00001 July 2, 2025 10:21
@melvin-bot
Copy link

melvin-bot bot commented Jul 2, 2025

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

@mateuuszzzzz mateuuszzzzz changed the title Fix reload issues related to new SignInPage Bring back new SignInPage Jul 3, 2025
const isSplashVisible = splashScreenState === CONST.BOOT_SPLASH_STATE.VISIBLE;
const isHybridAppReady = splashScreenState === CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN && isAuthenticated;
const shouldHideSplash = shouldInit && (CONFIG.IS_HYBRID_APP ? isHybridAppReady : isSplashVisible);
const shouldInit = isNavigationReady && hasAttemptedToOpenPublicRoom && !!preferredLocale && (CONFIG.IS_HYBRID_APP ? !hybridApp?.loggedOutFromOldDot : true);
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd check if that condition is correct. After our changes, we say that the app shouldn't be init if we logged out from OldDot, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

done

Comment on lines +119 to +123
const shouldHideSplash =
shouldInit &&
(CONFIG.IS_HYBRID_APP
? splashScreenState === CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN && (isAuthenticated || !!hybridApp?.useNewDotSignInPage)
: splashScreenState === CONST.BOOT_SPLASH_STATE.VISIBLE);
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's split this logic as it's split on main currently

Copy link
Contributor

Choose a reason for hiding this comment

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

done

authPromiseResolver = null;
}
if (CONFIG.IS_HYBRID_APP && session.authToken && session.authToken !== INVALID_TOKEN) {
if (CONFIG.IS_HYBRID_APP && session.authToken && session.authToken !== INVALID_TOKEN && isSetUpReady) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's check if this additional value is still necessary

Copy link
Contributor

Choose a reason for hiding this comment

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

it is :/ Without it we would send old auth token to OD when we sign out from it

Comment on lines +306 to +311
useEffect(() => {
if (!CONFIG.IS_HYBRID_APP || !hybridApp?.loggedOutFromOldDot) {
return;
}
HybridAppModule.clearOldDotAfterSignOut();
}, [hybridApp?.loggedOutFromOldDot]);
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we really have to do this in useEffect? 🤔
If we decide to change loggedOutFromOldDot in some other place, this logic will fire :/

How about putting this in Session/index.ts in setupNewDotAfterTransitionFromOldDot?
cc @mateuuszzzzz for thoughts

Copy link
Contributor

Choose a reason for hiding this comment

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

I added comment expalining why we do it here

war-in added 2 commits July 8, 2025 16:13
# Conflicts:
#	src/components/BookTravelButton.tsx
#	src/pages/signin/SAMLSignInPage/index.native.tsx
…eload-on-new-sign-in-page

# Conflicts:
#	modules/hybrid-app/android/src/main/java/com/expensify/reactnativehybridapp/ReactNativeHybridApp.kt
#	modules/hybrid-app/ios/ReactNativeHybridApp.mm
#	modules/hybrid-app/src/NativeReactNativeHybridApp.ts
#	modules/hybrid-app/src/index.native.ts
#	modules/hybrid-app/src/index.ts
#	modules/hybrid-app/src/types.ts
#	src/App.tsx
@github-actions
Copy link
Contributor

🚧 @mountiny has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions
Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
Built from App PR #65178 Mobile-Expensify PR Expensify/Mobile-Expensify#13607.

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/65178/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/65178/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/65178/NewExpensify.dmg https://65178.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@war-in
Copy link
Contributor

war-in commented Jul 31, 2025

Bugs summary:

@Julesssss Julesssss added the InternalQA This pull request required internal QA label Jul 31, 2025
@Julesssss
Copy link
Contributor

Thanks Marcin for fixing the second issue.

So yeah the Google SSO on AdHoc was expected, I broke that while fixing Google SSO on prod and this shouldn't block us.

@Julesssss
Copy link
Contributor

The ESLint warning will also be left as-is. This rule will be applied with later, for now we need to complete the auth page switch.

@Julesssss Julesssss merged commit 53883d3 into Expensify:main Jul 31, 2025
27 of 30 checks passed
@melvin-bot melvin-bot bot added the Emergency label Jul 31, 2025
@melvin-bot
Copy link

melvin-bot bot commented Jul 31, 2025

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

@Julesssss
Copy link
Contributor

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

See here.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 4, 2025

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.1.89-1 🚀

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

@Julesssss
Copy link
Contributor

Julesssss commented Aug 4, 2025

InternalQA
Authentication is working well. I did notice a couple of bugs that we'll need to solve though. Both only occur on Android and I opened up the magic sign-in issue for external contributors in the meantime. We do not want to revert this PR and have a couple of days to get these bugs resolved.

FYI @war-in for tomorrow

@github-actions
Copy link
Contributor

github-actions bot commented Aug 6, 2025

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.89-21 🚀

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

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

Labels

InternalQA This pull request required internal QA

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants