fix: check visibility as well to show another login message #34791

s-alves10 · 2024-01-19T10:19:14Z

Details

Check visibility as well to check if should show another login message

Fixed Issues

$ #34567
PROPOSAL: #34567 (comment)

Tests

Open ND and log out if logged in
[WEB ONLY] Enter email or phone number and tap Continue to go to the magic code page
[WEB ONLY] Open a new tab and navigate to the magic link(edit the magic code in the link to make the code invalid, e.g. change the last number)
[WEB ONLY] Verify that the magic code expired page is displayed
[WEB ONLY] Navigate to the original tab
[WEB ONLY] Verify that the magic code page is opened without any flickering

Verify that no errors appear in the JS console

Offline tests

This should be tested in online mode

QA Steps

Open ND and log out if logged in
[WEB ONLY] Enter email or phone number and tap Continue to go to the magic code page
[WEB ONLY] Open a new tab and navigate to the magic link with wrong magic code and correct domain
[WEB ONLY] Verify that the magic code expired page is displayed
[WEB ONLY] Navigate to the original tab
[WEB ONLY] Verify that the magic code page is opened without any flickering

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

34567_android_native.mp4

Android: mWeb Chrome

34567_android_chrome.mp4

iOS: Native

34567_ios_native.mp4

iOS: mWeb Safari

34567_ios_safari.mp4

MacOS: Chrome / Safari

34567_mac_chrome.mp4

MacOS: Desktop

34567_mac_desktop.mp4

melvin-bot · 2024-01-19T11:03:29Z

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

jjcoffee · 2024-01-26T14:54:24Z

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 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
- 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 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.js 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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

android-native-2024-01-29_14.11.49.mp4

Android: mWeb Chrome

android-chrome-2024-01-29_14.14.40.mp4

iOS: Native

ios-native-2024-01-29_14.19.35.mp4

iOS: mWeb Safari

ios-safari-2024-01-29_14.24.08.mp4

MacOS: Chrome / Safari

desktop-chrome-2024-01-29_13.55.25.mp4

MacOS: Desktop

desktop-app-2024-01-29_14.00.18.mp4

jjcoffee · 2024-01-26T14:57:01Z

[WEB ONLY] Open a new tab and navigate to the magic link with wrong magic code and correct domain

@s-alves10 Could you tweak this to be something more like "...edit the magic link to make the code invalid, e.g. change the last few digits"? I find it a bit unclear otherwise.

jjcoffee · 2024-01-26T14:57:45Z

src/pages/signin/SignInPage.js

@@ -154,6 +155,8 @@ function SignInPageInner({credentials, account, isInModal, activeClients, prefer
    const [hasInitiatedSAMLLogin, setHasInitiatedSAMLLogin] = useState(false);

    const isClientTheLeader = activeClients && ActiveClientManager.isClientTheLeader();
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowAnotherLogin = Visibility.isVisible() && !isClientTheLeader;


A brief comment explaining what this does would be useful I think as the name by itself isn't super clear!

In fact I think we need to tweak the name, as it reads to me as more like "should we show another login form" (which obviously doesn't make sense!), what do you think about something like hasAnotherLoginPageOpen?

I think shouldShowAnotherLoginPageOpenedMessage would be nice. What do you think @jjcoffee ?

Name updated and comment added

s-alves10 · 2024-01-26T21:27:47Z

@s-alves10 Could you tweak this to be something more like "...edit the magic link to make the code invalid, e.g. change the last few digits"? I find it a bit unclear otherwise.

Updated

s-alves10 · 2024-01-26T21:36:28Z

@s-alves10 As mentioned in the issue, I'm not able to reproduce this anymore on staging or main. I also get some weird issues when testing on your PR, e.g. after logging in on the original (leader) tab I get an LHN with only one chat (even though I'm in "Most Recent" mode).

I'm not sure what this means. Can you please test once more? I wasn't able to reproduce what you mentioned. Also the code changes isn't related to LHN at all

jjcoffee · 2024-01-29T12:51:49Z

Can you please test once more? I wasn't able to reproduce what you mentioned.

Never mind, I managed to repro the same issue on staging!

jjcoffee

LGTM!

mountiny

Thanks!

OSBotify · 2024-01-29T17:18:55Z

✋ 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 · 2024-01-29T19:24:54Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.33-0 🚀

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

OSBotify · 2024-01-31T02:31:45Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.33-5 🚀

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

fix: check visibility as well to show another login message

5022bcf

s-alves10 marked this pull request as ready for review January 19, 2024 11:03

s-alves10 requested a review from a team as a code owner January 19, 2024 11:03

melvin-bot bot requested review from jjcoffee and removed request for a team January 19, 2024 11:03

s-alves10 mentioned this pull request Jan 23, 2024

[HOLD for payment 2024-02-07] [$500] Magic code - An additional page appears when navigate from Abracadabra page #34567

Closed

6 tasks

jjcoffee reviewed Jan 26, 2024

View reviewed changes

This comment was marked as resolved.

Sign in to view

merged main

807fbb6

fix: rename variable and add comment

8764cac

jjcoffee approved these changes Jan 29, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny January 29, 2024 13:28

mountiny assigned s-alves10 Jan 29, 2024

mountiny approved these changes Jan 29, 2024

View reviewed changes

mountiny merged commit af9f20a into Expensify:main Jan 29, 2024
16 of 17 checks passed

github-actions bot mentioned this pull request Jan 29, 2024

Deploy Checklist: New Expensify 2024-01-29 #35328

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: check visibility as well to show another login message #34791

fix: check visibility as well to show another login message #34791

s-alves10 commented Jan 19, 2024 •

edited

Loading

melvin-bot bot commented Jan 19, 2024

jjcoffee commented Jan 26, 2024 •

edited

Loading

jjcoffee commented Jan 26, 2024

jjcoffee Jan 26, 2024

jjcoffee Jan 26, 2024

s-alves10 Jan 26, 2024

s-alves10 Jan 26, 2024

This comment was marked as resolved.

s-alves10 commented Jan 26, 2024

s-alves10 commented Jan 26, 2024

jjcoffee commented Jan 29, 2024

jjcoffee left a comment

mountiny left a comment

OSBotify commented Jan 29, 2024

OSBotify commented Jan 29, 2024

OSBotify commented Jan 31, 2024

fix: check visibility as well to show another login message #34791

fix: check visibility as well to show another login message #34791

Conversation

s-alves10 commented Jan 19, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 19, 2024

jjcoffee commented Jan 26, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

jjcoffee commented Jan 26, 2024

jjcoffee Jan 26, 2024

Choose a reason for hiding this comment

jjcoffee Jan 26, 2024

Choose a reason for hiding this comment

s-alves10 Jan 26, 2024

Choose a reason for hiding this comment

s-alves10 Jan 26, 2024

Choose a reason for hiding this comment

This comment was marked as resolved.

s-alves10 commented Jan 26, 2024

s-alves10 commented Jan 26, 2024

jjcoffee commented Jan 29, 2024

jjcoffee left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 29, 2024

OSBotify commented Jan 29, 2024

OSBotify commented Jan 31, 2024

s-alves10 commented Jan 19, 2024 •

edited

Loading

jjcoffee commented Jan 26, 2024 •

edited

Loading