Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions shared/constants/platform-specific/index.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,10 @@ const loadStartupDetails = async () => {
neverThrowPromiseFunc(async () => {
const linkingStart = Date.now()
logger.info('[Startup] loadStartupDetails: calling Linking.getInitialURL')
const timeout = new Promise<null>(resolve => setTimeout(() => resolve(null), 100))
const url = await Promise.race([Linking.getInitialURL(), timeout])
const url = await Linking.getInitialURL()
const elapsed = Date.now() - linkingStart
if (url === null) {
logger.warn(`[Startup] loadStartupDetails: Linking.getInitialURL returned null/timed out in ${elapsed}ms`)
logger.warn(`[Startup] loadStartupDetails: Linking.getInitialURL returned null in ${elapsed}ms`)
} else {
logger.info(`[Startup] loadStartupDetails: Linking.getInitialURL returned in ${elapsed}ms: ${url}`)
}
Expand Down
3 changes: 1 addition & 2 deletions shared/router-v2/hooks.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ export const useInitialState = (loggedInLoaded: boolean) => {
}
setInitialStateState('loading')
const loadInitialURL = async () => {
const timeout = new Promise<null>(resolve => setTimeout(() => resolve(null), 100))
let url = await Promise.race([Linking.getInitialURL(), timeout])
let url = await Linking.getInitialURL()

// don't try and resume or follow links if we're signed out
if (!loggedIn) {
Expand Down