feat(prejoin) default to enabled (#14236)

* feat(prejoin) default to enabled

* squash: Fixes is prejoin config check.

---------

Co-authored-by: damencho <damencho@jitsi.org>

config.js

@@ -723,7 +723,7 @@ var config = {
     // Configs for prejoin page.
     // prejoinConfig: {
     //     // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
-    //     // This replaces `prejoinPageEnabled`.
+    //     // This replaces `prejoinPageEnabled`. Defaults to true.
     //     enabled: true,
     //     // Hides the participant name editing field in the prejoin screen.
     //     // If requireDisplayName is also set as true, a name should still be provided through

react/features/lobby/middleware.ts

@@ -43,7 +43,11 @@ import {
 import { INotificationProps } from '../notifications/types';
 import { open as openParticipantsPane } from '../participants-pane/actions';
 import { getParticipantsPaneOpen } from '../participants-pane/functions';
-import { isPrejoinPageVisible, shouldAutoKnock } from '../prejoin/functions';
+import {
+    isPrejoinEnabledInConfig,
+    isPrejoinPageVisible,
+    shouldAutoKnock
+} from '../prejoin/functions';
 
 import {
     KNOCKING_PARTICIPANT_ARRIVED_OR_UPDATED,
@@ -269,7 +273,6 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
     const { membersOnly } = state['features/base/conference'];
     const nonFirstFailure = Boolean(membersOnly);
     const { isDisplayNameRequiredError } = state['features/lobby'];
-    const { prejoinConfig } = state['features/base/config'];
 
     if (error.name === JitsiConferenceErrors.MEMBERS_ONLY_ERROR) {
         if (typeof error.recoverable === 'undefined') {
@@ -284,7 +287,9 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
         dispatch(openLobbyScreen());
 
         // if there was an error about display name and pre-join is not enabled
-        if (shouldAutoKnock(state) || (isDisplayNameRequiredError && !prejoinConfig?.enabled) || lobbyWaitingForHost) {
+        if (shouldAutoKnock(state)
+                || (isDisplayNameRequiredError && !isPrejoinEnabledInConfig(state))
+                || lobbyWaitingForHost) {
             dispatch(startKnocking());
         }
 

react/features/mobile/navigation/functions.tsx

@@ -11,6 +11,7 @@ import { getFeatureFlag } from '../../base/flags/functions';
 import { IconCloseLarge } from '../../base/icons/svg';
 import { toState } from '../../base/redux/functions';
 import { cancelKnocking } from '../../lobby/actions.native';
+import { isPrejoinEnabledInConfig } from '../../prejoin/functions';
 
 import HeaderNavigationButton from './components/HeaderNavigationButton';
 
@@ -50,10 +51,8 @@ export function screenHeaderCloseButton(goBack: (e?: GestureResponderEvent | Rea
  */
 export function isPrejoinPageEnabled(stateful: IStateful) {
     const state = toState(stateful);
-    const { prejoinConfig } = state['features/base/config'];
-    const isPrejoinEnabledInConfig = prejoinConfig?.enabled;
 
-    return getFeatureFlag(state, PREJOIN_PAGE_ENABLED, isPrejoinEnabledInConfig ?? true);
+    return getFeatureFlag(state, PREJOIN_PAGE_ENABLED, isPrejoinEnabledInConfig(state));
 }
 
 /**

react/features/prejoin/functions.ts

@@ -42,6 +42,16 @@ export function isDisplayNameRequired(state: IReduxState): boolean {
         || state['features/base/config']?.requireDisplayName);
 }
 
+/**
+ * Selector for determining if the prejoin page is enabled in config. Defaults to `true`.
+ *
+ * @param {IReduxState} state - The state of the app.
+ * @returns {boolean}
+ */
+export function isPrejoinEnabledInConfig(state: IReduxState): boolean {
+    return state['features/base/config'].prejoinConfig?.enabled ?? true;
+}
+
 /**
  * Selector for determining if the prejoin display name field is visible.
  *
@@ -154,7 +164,7 @@ export function isJoinByPhoneDialogVisible(state: IReduxState): boolean {
  */
 export function isPrejoinPageVisible(state: IReduxState): boolean {
     return Boolean(navigator.product !== 'ReactNative'
-        && state['features/base/config'].prejoinConfig?.enabled
+        && isPrejoinEnabledInConfig(state)
         && state['features/prejoin']?.showPrejoin
         && !(state['features/base/config'].enableForcedReload && state['features/prejoin'].skipPrejoinOnReload));
 }
@@ -166,12 +176,11 @@ export function isPrejoinPageVisible(state: IReduxState): boolean {
  * @returns {boolean}
  */
 export function shouldAutoKnock(state: IReduxState): boolean {
-    const { iAmRecorder, iAmSipGateway, prejoinConfig } = state['features/base/config'];
+    const { iAmRecorder, iAmSipGateway } = state['features/base/config'];
     const { userSelectedSkipPrejoin } = state['features/base/settings'];
     const { autoKnock } = getLobbyConfig(state);
-    const isPrejoinEnabled = prejoinConfig?.enabled;
 
-    return Boolean(((isPrejoinEnabled && !userSelectedSkipPrejoin)
+    return Boolean(((isPrejoinEnabledInConfig(state) && !userSelectedSkipPrejoin)
             || autoKnock || (iAmRecorder && iAmSipGateway))
         && !state['features/lobby'].knocking);
 }

react/features/settings/components/native/GeneralSection.tsx

@@ -11,6 +11,7 @@ import { updateSettings } from '../../../base/settings/actions';
 import Switch from '../../../base/ui/components/native/Switch';
 import { navigate } from '../../../mobile/navigation/components/settings/SettingsNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
+import { isPrejoinEnabledInConfig } from '../../../prejoin/functions';
 
 import FormRow from './FormRow';
 import FormSection from './FormSection';
@@ -27,8 +28,7 @@ const GeneralSection = () => {
 
     const showPrejoinPage = !userSelectedSkipPrejoin;
 
-    let showPrejoinSettings = useSelector(
-        (state: IReduxState) => state['features/base/config'].prejoinConfig?.enabled);
+    let showPrejoinSettings = useSelector(isPrejoinEnabledInConfig);
 
     const { language = DEFAULT_LANGUAGE } = i18next;
 

react/features/settings/functions.any.ts

@@ -10,6 +10,7 @@ import { getHideSelfView } from '../base/settings/functions.any';
 import { parseStandardURIString } from '../base/util/uri';
 import { isStageFilmstripEnabled } from '../filmstrip/functions';
 import { isFollowMeActive } from '../follow-me/functions';
+import { isPrejoinEnabledInConfig } from '../prejoin/functions';
 import { isReactionsEnabled } from '../reactions/functions.any';
 import { iAmVisitor } from '../visitors/functions';
 
@@ -114,7 +115,7 @@ export function getMoreTabProps(stateful: IStateful) {
         maxStageParticipants: state['features/base/settings'].maxStageParticipants,
         showLanguageSettings: configuredTabs.includes('language'),
         showPrejoinPage: !state['features/base/settings'].userSelectedSkipPrejoin,
-        showPrejoinSettings: state['features/base/config'].prejoinConfig?.enabled,
+        showPrejoinSettings: isPrejoinEnabledInConfig(state),
         stageFilmstripEnabled
     };
 }