Skip to content

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

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.

Sign up for GitHub

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

Merged
johnmlee101 merged 5 commits into from
Dec 12, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1eaaf8b
add dekstop app origin to linking prefix
tienifr Nov 29, 2023
9ca0a50
fix link prefix on mweb android
tienifr Nov 29, 2023
615c939
Merge branch 'main' of https://github.com/tienifr/App into fix/28495
tienifr Nov 29, 2023
4d4cc89
Merge branch 'main' of https://github.com/tienifr/App into fix/28495
tienifr Dec 6, 2023
2ee09db
move regex outside loop
tienifr Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/libs/Navigation/linkingConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ import SCREENS from '@src/SCREENS';
import {RootStackParamList} from './types';

const linkingConfig: LinkingOptions<RootStackParamList> = {
prefixes: ['new-expensify://', 'https://www.expensify.cash', 'https://staging.expensify.cash', 'https://dev.new.expensify.com', CONST.NEW_EXPENSIFY_URL, CONST.STAGING_NEW_EXPENSIFY_URL],
prefixes: [
'app://-/',
'new-expensify://',
'https://www.expensify.cash',
'https://staging.expensify.cash',
'https://dev.new.expensify.com',
CONST.NEW_EXPENSIFY_URL,
CONST.STAGING_NEW_EXPENSIFY_URL,
],
config: {
initialRouteName: SCREENS.HOME,
screens: {
Expand Down
2 changes: 1 addition & 1 deletion src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3631,8 +3631,8 @@ function getRouteFromLink(url: string | null): string {

// Get the reportID from URL
let route = url;

@eVoloshchak eVoloshchak Dec 5, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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}))/;

const localWebAndroidRegEx = /^(https:\/\/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}))/;
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)) {
Comment on lines 3635 to 3636

@shubham1206agra shubham1206agra Jan 11, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Marking for reference

route = route.replace(prefix, '');
} else if (localWebAndroidRegEx.test(route)) {
Expand Down