diff --git a/keyserver/src/responders/website-responders.js b/keyserver/src/responders/website-responders.js --- a/keyserver/src/responders/website-responders.js +++ b/keyserver/src/responders/website-responders.js @@ -196,12 +196,11 @@ 'default communityPickerStore', _isEqual({ chat: null, calendar: null }), ), - urlPrefix: tString(''), + urlPrefix: t.String, windowDimensions: t.irreducible( 'default windowDimensions', _isEqual({ width: 0, height: 0 }), ), - baseHref: t.String, notifPermissionAlertInfo: t.irreducible( 'default notifPermissionAlertInfo', _isEqual(defaultNotifPermissionAlertInfo), @@ -267,7 +266,7 @@ const appURLFacts = getAppURLFactsFromRequestURL(req.originalUrl); const { basePath, baseDomain } = appURLFacts; const baseURL = basePath.replace(/\/$/, ''); - const baseHref = baseDomain + baseURL; + const urlPrefix = baseDomain + baseURL; const loadingPromise = getWebpackCompiledRootComponentForSSR(); const hasNotAcknowledgedPoliciesPromise = hasAnyNotAcknowledgedPolicies( @@ -581,10 +580,8 @@ loadingStatuses: {}, calendarFilters: defaultCalendarFilters, communityPickerStore: { chat: null, calendar: null }, - // We can use paths local to the on web - urlPrefix: '', + urlPrefix, windowDimensions: { width: 0, height: 0 }, - baseHref, notifPermissionAlertInfo: defaultNotifPermissionAlertInfo, connection: (async () => ({ ...defaultConnectionInfo(viewer.platform ?? 'web', viewer.timeZone), diff --git a/web/redux/redux-setup.js b/web/redux/redux-setup.js --- a/web/redux/redux-setup.js +++ b/web/redux/redux-setup.js @@ -83,7 +83,6 @@ +urlPrefix: string, +windowDimensions: WindowDimensions, +deviceToken: ?string, - +baseHref: string, +notifPermissionAlertInfo: NotifPermissionAlertInfo, +connection: ConnectionInfo, +watchedThreadIDs: $ReadOnlyArray, diff --git a/web/selectors/socket-selectors.js b/web/selectors/socket-selectors.js --- a/web/selectors/socket-selectors.js +++ b/web/selectors/socket-selectors.js @@ -29,7 +29,7 @@ import type { AppState } from '../redux/redux-setup.js'; const openSocketSelector: (state: AppState) => () => WebSocket = createSelector( - (state: AppState) => state.baseHref, + (state: AppState) => state.urlPrefix, createOpenSocketFunction, );