Merge pull request Expensify#69618 from Expensify/scott-removeVacationDelegateBeta

Remove beta & check for vacation delegate

Author: deetergp

src/CONST/index.ts

@@ -696,7 +696,6 @@ const CONST = {
         EUR_BILLING: 'eurBilling',
         MANUAL_DISTANCE: 'manualDistance',
         NO_OPTIMISTIC_TRANSACTION_THREADS: 'noOptimisticTransactionThreads',
-        VACATION_DELEGATE: 'vacationDelegate',
         UBER_FOR_BUSINESS: 'uberForBusiness',
         DUPLICATE_WORKSPACE: 'duplicatePolicyNewDot',
     },

src/pages/settings/Profile/CustomStatus/StatusPage.tsx

@@ -18,7 +18,6 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
-import usePermissions from '@hooks/usePermissions';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -52,9 +51,6 @@ function StatusPage() {
     const vacationDelegatePersonalDetails = getPersonalDetailByEmail(vacationDelegate?.delegate ?? '');
     const formattedDelegateLogin = formatPhoneNumber(vacationDelegatePersonalDetails?.login ?? '');
 
-    const {isBetaEnabled} = usePermissions();
-    const isVacationDelegateEnabled = isBetaEnabled(CONST.BETAS.VACATION_DELEGATE);
-
     const currentUserEmojiCode = currentUserPersonalDetails?.status?.emojiCode ?? '';
     const currentUserStatusText = currentUserPersonalDetails?.status?.text ?? '';
     const currentUserClearAfter = currentUserPersonalDetails?.status?.clearAfter ?? '';
@@ -246,41 +242,39 @@ function StatusPage() {
                         />
                     )}
                 </View>
-                {isVacationDelegateEnabled && (
-                    <View style={[styles.mb2, styles.mt6]}>
-                        <Text style={[styles.mh5]}>{translate('statusPage.setVacationDelegate')}</Text>
-                        {hasVacationDelegate && <Text style={[styles.mh5, styles.mt6, styles.mutedTextLabel]}>{translate('statusPage.vacationDelegate')}</Text>}
-                        {hasVacationDelegate ? (
-                            <OfflineWithFeedback
-                                pendingAction={vacationDelegate?.pendingAction}
-                                errors={vacationDelegate?.errors}
-                                errorRowStyles={styles.mh5}
-                                onClose={() => clearVacationDelegateError(vacationDelegate?.previousDelegate)}
-                            >
-                                <MenuItem
-                                    title={vacationDelegatePersonalDetails?.displayName ?? fallbackVacationDelegateLogin}
-                                    description={fallbackVacationDelegateLogin}
-                                    avatarID={vacationDelegatePersonalDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID}
-                                    icon={vacationDelegatePersonalDetails?.avatar ?? Expensicons.FallbackAvatar}
-                                    iconType={CONST.ICON_TYPE_AVATAR}
-                                    numberOfLinesDescription={1}
-                                    shouldShowRightIcon
-                                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE)}
-                                    containerStyle={styles.pr2}
-                                />
-                            </OfflineWithFeedback>
-                        ) : (
-                            <View style={[styles.mt1]}>
-                                <MenuItem
-                                    description={translate('statusPage.vacationDelegate')}
-                                    shouldShowRightIcon
-                                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE)}
-                                    containerStyle={styles.pr2}
-                                />
-                            </View>
-                        )}
-                    </View>
-                )}
+                <View style={[styles.mb2, styles.mt6]}>
+                    <Text style={[styles.mh5]}>{translate('statusPage.setVacationDelegate')}</Text>
+                    {hasVacationDelegate && <Text style={[styles.mh5, styles.mt6, styles.mutedTextLabel]}>{translate('statusPage.vacationDelegate')}</Text>}
+                    {hasVacationDelegate ? (
+                        <OfflineWithFeedback
+                            pendingAction={vacationDelegate?.pendingAction}
+                            errors={vacationDelegate?.errors}
+                            errorRowStyles={styles.mh5}
+                            onClose={() => clearVacationDelegateError(vacationDelegate?.previousDelegate)}
+                        >
+                            <MenuItem
+                                title={vacationDelegatePersonalDetails?.displayName ?? fallbackVacationDelegateLogin}
+                                description={fallbackVacationDelegateLogin}
+                                avatarID={vacationDelegatePersonalDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID}
+                                icon={vacationDelegatePersonalDetails?.avatar ?? Expensicons.FallbackAvatar}
+                                iconType={CONST.ICON_TYPE_AVATAR}
+                                numberOfLinesDescription={1}
+                                shouldShowRightIcon
+                                onPress={() => Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE)}
+                                containerStyle={styles.pr2}
+                            />
+                        </OfflineWithFeedback>
+                    ) : (
+                        <View style={[styles.mt1]}>
+                            <MenuItem
+                                description={translate('statusPage.vacationDelegate')}
+                                shouldShowRightIcon
+                                onPress={() => Navigation.navigate(ROUTES.SETTINGS_VACATION_DELEGATE)}
+                                containerStyle={styles.pr2}
+                            />
+                        </View>
+                    )}
+                </View>
             </FormProvider>
         </ScreenWrapper>
     );