fix: fix firefox redirection from old dot #18631

koko57 · 2023-05-09T08:12:53Z

Details

Second attempt to fix firefox redirection issue.

Fixed Issues

$ #17630
PROPOSAL: #17630

Tests

Log in to https://www.expensify.com on Firefox
Click the Concierge chat button
A new tab with https://new.expensify.com should open, you should be already logged in

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Log in to https://www.expensify.com on Firefox
Click the Concierge chat button
A new tab with https://new.expensify.com should open, you should be already logged in

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 / 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 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 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

(This is how I was able to reproduce it locally, it won't look that way in production ;) )

not_working.mov

working.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

mountiny · 2023-05-13T22:36:17Z

@ntdiary will you want to do all the testing and reviewer checklist?

ntdiary · 2023-05-14T07:40:34Z

@mountiny , yeah, I would be glad to to these things if permitted. : )

mountiny · 2023-05-14T13:29:45Z

@ntdiary Of course, I think you can do all the checklist and review just fine once this is not a draft

melvin-bot · 2023-05-14T17:12:40Z

@neil-marcellini 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]

mountiny · 2023-05-14T17:13:04Z

@ntdiary seems like @koko57 suggested this is good to test. We should update the PR body with test and QA steps (they are different)

mountiny · 2023-05-14T17:13:32Z

@koko57 just noting the issue was incorrectly linked, it must be:

$ https://github.com/Expensify/App/issues/17630

Just for future prs its easy to miss this :D

mountiny · 2023-05-14T17:14:17Z

Sorry for the ping Neil

ntdiary · 2023-05-15T13:50:29Z

@mountiny hi, a small question, do I need to add test steps and do the author checklist? (I don't have permission to edit them now), or do I just need to wait for @koko57 to finish them and then I will fill in the reviewer checklist and upload the video as soon as possible? : )

ntdiary · 2023-05-15T14:53:25Z

src/components/DeeplinkWrapper/index.website.js

@@ -87,7 +87,7 @@ class DeeplinkWrapper extends PureComponent {
        // This check is necessary for Safari, otherwise, if the user
        // does NOT have the Expensify desktop app installed, it's gonna
        // show an error in the page saying that the address is invalid
-        if (CONST.BROWSER.SAFARI === Browser.getBrowser()) {
+        if (CONST.BROWSER.SAFARI === Browser.getBrowser() || CONST.BROWSER.FIREFOX === Browser.getBrowser()) {


Suggested change

if (CONST.BROWSER.SAFARI === Browser.getBrowser() || CONST.BROWSER.FIREFOX === Browser.getBrowser()) {

// This check is also necessary for Firefox, otherwise the window.location.href redirect will abort the fetch request from NetInfo,

// which will cause the app to go offline temporarily.

const browser = Browser.getBrowser();

if (browser === CONST.BROWSER.SAFARI || browser === CONST.BROWSER.FIREFOX) {

A small suggestion, hope it can help others understand the intention of the code, and reduce one call to the getBrowser function. : )

Thanks 😊

mountiny · 2023-05-15T16:51:04Z

@koko57 can you please add the PR author checklist filled in and testing/ QA steps so @ntdiary can follow that?

Ideally also show videos of your tests confirming this works, I will trigger a build

OSBotify · 2023-05-15T17:52:11Z

🧪🧪 Use the links below to test this build in android and iOS. Happy testing! 🧪🧪

android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/18631/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/18631/index.html

desktop 💻	web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/18631/NewExpensify.dmg	https://18631.pr-testing.expensify.com

ntdiary · 2023-05-16T09:15:50Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

firefox.mp4

Mobile Web - Chrome

N/A

Mobile Web - Safari

N/A

Desktop

N/A

iOS

N/A

Android

N/A

mountiny

@koko57 Me watching the not-working video being like huh 😂 this does not seem fixed

@koko57 @ntdiary thank you both so much, this one has been not easy to figure out!

github-actions · 2023-05-17T10:23:28Z

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

melvin-bot · 2023-05-17T10:34:16Z

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

…refox fix: fix firefox redirection from old dot (cherry picked from commit 7db9619)

…-18631 🍒 Cherry pick PR #18631 to staging 🍒

OSBotify · 2023-05-17T13:11:09Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 1.3.15-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-05-18T06:50:32Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.15-12 🚀

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

OSBotify · 2023-06-15T01:29:15Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-06-16T18:47:04Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

fix: fix firefox redirection from old dot

cccd3b7

koko57 mentioned this pull request May 9, 2023

[HOLD for payment 2023-05-29]OldDot deeplink to Concierge does not keep user signed in using Firefox #17630

Closed

6 tasks

mountiny assigned koko57 May 13, 2023

mountiny marked this pull request as ready for review May 14, 2023 17:12

mountiny requested a review from a team as a code owner May 14, 2023 17:12

melvin-bot bot removed the request for review from a team May 14, 2023 17:12

melvin-bot bot requested a review from neil-marcellini May 14, 2023 17:12

mountiny requested review from mountiny and removed request for neil-marcellini May 14, 2023 17:14

ntdiary suggested changes May 15, 2023

View reviewed changes

mountiny added the Ready To Build label May 15, 2023

koko57 added 2 commits May 16, 2023 08:57

Merge branch 'main' into fix/17630-oldDot-redirect-in-firefox

660f285

fix: apply requested changes

d9f9492

ntdiary approved these changes May 16, 2023

View reviewed changes

mountiny approved these changes May 17, 2023

View reviewed changes

mountiny added the CP Staging label May 17, 2023

mountiny merged commit 7db9619 into Expensify:main May 17, 2023

OSBotify pushed a commit that referenced this pull request May 17, 2023

Merge pull request #18631 from koko57/fix/17630-oldDot-redirect-in-fi…

97d0b54

…refox fix: fix firefox redirection from old dot (cherry picked from commit 7db9619)

OSBotify mentioned this pull request May 17, 2023

🍒 Cherry pick PR #18631 to staging 🍒 #19114

Merged

OSBotify added a commit that referenced this pull request May 17, 2023

Merge pull request #19114 from Expensify/mountiny-cherry-pick-staging…

90f4f32

…-18631 🍒 Cherry pick PR #18631 to staging 🍒

OSBotify mentioned this pull request May 17, 2023

Deploy Checklist: New Expensify 2023-05-16 #19088

Closed

71 tasks

OSBotify mentioned this pull request May 18, 2023

Deploy Checklist: New Expensify 2023-05-18 #19175

Closed

39 tasks

OSBotify mentioned this pull request Jun 15, 2023

Deploy Checklist: New Expensify 2023-06-14 #20782

Closed

koko57 deleted the fix/17630-oldDot-redirect-in-firefox branch September 28, 2023 15:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: fix firefox redirection from old dot #18631

fix: fix firefox redirection from old dot #18631

koko57 commented May 9, 2023 •

edited

Loading

mountiny commented May 13, 2023

ntdiary commented May 14, 2023

mountiny commented May 14, 2023

melvin-bot bot commented May 14, 2023

mountiny commented May 14, 2023

mountiny commented May 14, 2023 •

edited

Loading

mountiny commented May 14, 2023

ntdiary commented May 15, 2023 •

edited

Loading

ntdiary May 15, 2023

koko57 May 15, 2023

mountiny commented May 15, 2023

OSBotify commented May 15, 2023

ntdiary commented May 16, 2023

mountiny left a comment

github-actions bot commented May 17, 2023

melvin-bot bot commented May 17, 2023

OSBotify commented May 17, 2023

OSBotify commented May 18, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

-        if (CONST.BROWSER.SAFARI === Browser.getBrowser() || CONST.BROWSER.FIREFOX === Browser.getBrowser()) {
+        // This check is also necessary for Firefox, otherwise the window.location.href redirect will abort the fetch request from NetInfo,
+        // which will cause the app to go offline temporarily.
+        const browser = Browser.getBrowser();
+        if (browser === CONST.BROWSER.SAFARI || browser === CONST.BROWSER.FIREFOX) {

fix: fix firefox redirection from old dot #18631

fix: fix firefox redirection from old dot #18631

Conversation

koko57 commented May 9, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

mountiny commented May 13, 2023

ntdiary commented May 14, 2023

mountiny commented May 14, 2023

melvin-bot bot commented May 14, 2023

mountiny commented May 14, 2023

mountiny commented May 14, 2023 • edited Loading

mountiny commented May 14, 2023

ntdiary commented May 15, 2023 • edited Loading

ntdiary May 15, 2023

Choose a reason for hiding this comment

koko57 May 15, 2023

Choose a reason for hiding this comment

mountiny commented May 15, 2023

OSBotify commented May 15, 2023

ntdiary commented May 16, 2023

Reviewer Checklist

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

github-actions bot commented May 17, 2023

melvin-bot bot commented May 17, 2023

OSBotify commented May 17, 2023

OSBotify commented May 18, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

koko57 commented May 9, 2023 •

edited

Loading

mountiny commented May 14, 2023 •

edited

Loading

ntdiary commented May 15, 2023 •

edited

Loading