Add desktop's `app://-/` origin to linking prefixes #32158

tienifr · 2023-11-29T04:20:26Z

Details

Production desktop app does not parse correct route because it uses app://-/ domain. We have the same problem with local web android on https://127.0.0.1 domain. This PR fixes that.

Fixed Issues

$ #28495
PROPOSAL: #28495 (comment)

Tests

Open the app
Reload app (CMD+R or View >> Reload)
Verify app does not show Not found page

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Build production desktop app npm run desktop-build
Open the app
Reload app (CMD+R or View >> Reload)
Verify app does not show Not found page

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

Android: Native

Android: mWeb Chrome

Screen.Recording.2023-11-29.at.11.40.39-compressed.mov

iOS: Native

Screen.Recording.2023-11-29.at.11.24.20-compressed.mov

iOS: mWeb Safari

Screen.Recording.2023-11-29.at.11.25.27-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2023-11-29.at.11.22.56-compressed.mov

MacOS: Desktop

Screen.Recording.2023-11-29.at.11.54.30-compressed.mov

melvin-bot · 2023-11-29T04:56:49Z

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

tienifr · 2023-12-05T07:16:42Z

@eVoloshchak Can you check?

eVoloshchak · 2023-12-05T20:12:26Z

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

Screen.Recording.2023-12-06.at.22.31.19.mov

Android: mWeb Chrome

Screen.Recording.2023-12-06.at.22.30.19.mov

iOS: Native

Screen.Recording.2023-12-06.at.22.29.33.mov

iOS: mWeb Safari

Screen.Recording.2023-12-06.at.22.29.58.mov

MacOS: Chrome / Safari

Screen.Recording.2023-12-06.at.22.29.05.mov

MacOS: Desktop

Screen.Recording.2023-12-06.at.22.40.11.mov

eVoloshchak · 2023-12-05T22:39:45Z

src/libs/ReportUtils.ts

@@ -3592,7 +3592,7 @@ function getRouteFromLink(url: string | null): string {
    // Get the reportID from URL
    let route = url;
    linkingConfig.prefixes.forEach((prefix) => {
-        const localWebAndroidRegEx = /^(http:\/\/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}))/;
+        const localWebAndroidRegEx = /^(https:\/\/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}))/;


We can move this outside of forEach

eVoloshchak · 2023-12-05T22:43:30Z

src/libs/ReportUtils.ts

@@ -3592,7 +3592,7 @@ function getRouteFromLink(url: string | null): string {
    // Get the reportID from URL
    let route = url;


Suggested change

let route = url;

let route = url;

const localWebAndroidRegEx = /^((https|http):\/\/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}))/;

eVoloshchak

LGTM

shubham1206agra · 2023-12-07T19:01:33Z

Have you checked adhoc build links too? If not, please create an ad-hoc build and test here please
Cause I am getting not-found error on https://28976.pr-testing.expensify.com/

tienifr · 2023-12-07T19:09:28Z

That's because the adhoc domain name is not standard and thus not explicitly handled. It's working fine on dev, staging and production domain.

shubham1206agra · 2023-12-07T19:11:40Z

Can you handle this too?

tienifr · 2023-12-07T20:43:44Z

I'm not sure. I'm afraid that it might get out of scope. @eVoloshchak What do you think?

eVoloshchak · 2023-12-11T16:19:46Z

Yeah, I think it's out of scope too
If this becomes a problem, we should handle it in a separate issue (we'll need a different approach for that I think), but I don't think it will, since it's only ad-hoc

mallenexpensify · 2023-12-11T22:41:51Z

Are we waiting on a review from @johnmlee101 to move this forward? Looks like it.

tienifr · 2023-12-12T06:51:23Z

Yes, still wait for @johnmlee101 to take a look.

OSBotify · 2023-12-12T22:24: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.

OSBotify · 2023-12-13T11:29:10Z

🚀 Deployed to staging by https://github.com/johnmlee101 in version: 1.4.12-0 🚀

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

OSBotify · 2023-12-13T11:49:53Z

🚀 Deployed to staging by https://github.com/johnmlee101 in version: 1.4.12-0 🚀

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

OSBotify · 2023-12-13T12:17:27Z

🚀 Deployed to staging by https://github.com/johnmlee101 in version: 1.4.12-0 🚀

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

OSBotify · 2023-12-14T15:24:10Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.12-2 🚀

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

shubham1206agra · 2024-01-11T13:14:36Z

src/libs/ReportUtils.ts

    linkingConfig.prefixes.forEach((prefix) => {
-        const localWebAndroidRegEx = /^(http:\/\/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}))/;
        if (route.startsWith(prefix)) {


Marking for reference

add dekstop app origin to linking prefix

1eaaf8b

tienifr changed the title ~~Add desktop's app://-/ origin and 127.0.0.1 to linking prefixes~~ Add desktop's app://-/ origin to linking prefixes Nov 29, 2023

fix link prefix on mweb android

9ca0a50

tienifr marked this pull request as ready for review November 29, 2023 04:56

tienifr requested a review from a team as a code owner November 29, 2023 04:56

melvin-bot bot requested review from eVoloshchak and removed request for a team November 29, 2023 04:56

tienifr mentioned this pull request Nov 29, 2023

[$1000] Desktop-"Hmm.. it's not here" page appears when the app auto closes to update #28495

Closed

6 tasks

Merge branch 'main' of https://github.com/tienifr/App into fix/28495

615c939

tienifr mentioned this pull request Dec 5, 2023

Fix: GetAssistance page does not navigate back properly after reloading #32466

Merged

56 tasks

situchan mentioned this pull request Dec 5, 2023

[$750] Desktop - "Hmm... it's not here" is displayed when a profile deeplink is opened two or more times #29372

Closed

6 tasks

eVoloshchak suggested changes Dec 5, 2023

View reviewed changes

tienifr added 2 commits December 6, 2023 14:38

Merge branch 'main' of https://github.com/tienifr/App into fix/28495

4d4cc89

move regex outside loop

2ee09db

eVoloshchak approved these changes Dec 6, 2023

View reviewed changes

melvin-bot bot requested a review from johnmlee101 December 6, 2023 21:41

johnmlee101 approved these changes Dec 12, 2023

View reviewed changes

johnmlee101 merged commit 4e3c34b into Expensify:main Dec 12, 2023

github-actions bot mentioned this pull request Dec 13, 2023

[$500] Deploy Checklist: New Expensify 2023-12-13 #32963

Closed

64 tasks

hannojg mentioned this pull request Jan 11, 2024

feat: app sounds #31055

Merged

50 tasks

shubham1206agra reviewed Jan 11, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add desktop's `app://-/` origin to linking prefixes #32158

Add desktop's `app://-/` origin to linking prefixes #32158

tienifr commented Nov 29, 2023 •

edited

Loading

melvin-bot bot commented Nov 29, 2023

tienifr commented Dec 5, 2023

eVoloshchak commented Dec 5, 2023 •

edited

Loading

eVoloshchak Dec 5, 2023

tienifr Dec 6, 2023

eVoloshchak Dec 5, 2023

eVoloshchak left a comment

shubham1206agra commented Dec 7, 2023

tienifr commented Dec 7, 2023

shubham1206agra commented Dec 7, 2023

tienifr commented Dec 7, 2023

eVoloshchak commented Dec 11, 2023

mallenexpensify commented Dec 11, 2023

tienifr commented Dec 12, 2023

OSBotify commented Dec 12, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 14, 2023

shubham1206agra Jan 11, 2024

		@@ -3592,7 +3592,7 @@ function getRouteFromLink(url: string \| null): string {
		// Get the reportID from URL
		let route = url;

	let route = url;
	let route = url;
	const localWebAndroidRegEx = /^((https\|http):\/\/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}))/;

Add desktop's app://-/ origin to linking prefixes #32158

Add desktop's app://-/ origin to linking prefixes #32158

Conversation

tienifr commented Nov 29, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 29, 2023

tienifr commented Dec 5, 2023

eVoloshchak commented Dec 5, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

eVoloshchak Dec 5, 2023

Choose a reason for hiding this comment

tienifr Dec 6, 2023

Choose a reason for hiding this comment

eVoloshchak Dec 5, 2023

Choose a reason for hiding this comment

eVoloshchak left a comment

Choose a reason for hiding this comment

shubham1206agra commented Dec 7, 2023

tienifr commented Dec 7, 2023

shubham1206agra commented Dec 7, 2023

tienifr commented Dec 7, 2023

eVoloshchak commented Dec 11, 2023

mallenexpensify commented Dec 11, 2023

tienifr commented Dec 12, 2023

OSBotify commented Dec 12, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 14, 2023

shubham1206agra Jan 11, 2024

Choose a reason for hiding this comment

Add desktop's `app://-/` origin to linking prefixes #32158

Add desktop's `app://-/` origin to linking prefixes #32158

tienifr commented Nov 29, 2023 •

edited

Loading

eVoloshchak commented Dec 5, 2023 •

edited

Loading