From 5cec4420dc5b43c7782590b341cc4f98e7c1175d Mon Sep 17 00:00:00 2001 From: Alf Eaton <75253002+aeaton-overleaf@users.noreply.github.com> Date: Thu, 22 Apr 2021 10:50:41 +0100 Subject: [PATCH] Merge pull request #3940 from overleaf/ae-share-modal-for-everyone Enable React share modal for all users GitOrigin-RevId: 2cb288e15770d3169034e4511df6537d010e924d --- .../app/src/Features/Project/ProjectController.js | 2 +- .../components/share-project-modal-content.js | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 6af78d4e75..411bb38c2f 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -863,7 +863,7 @@ const ProjectController = { showNewNavigationUI: req.query && req.query.new_navigation_ui === 'true', showReactFileTree: !wantsOldFileTreeUI, - showReactShareModal: user.betaProgram && !wantsOldShareModalUI, + showReactShareModal: !wantsOldShareModalUI, showReactAddFilesModal: user.betaProgram && !wantsOldAddFilesModalUI, showReactGithubSync: !wantsOldGithubSyncUI && user.alphaProgram diff --git a/services/web/frontend/js/features/share-project-modal/components/share-project-modal-content.js b/services/web/frontend/js/features/share-project-modal/components/share-project-modal-content.js index 9bc1396c8d..2059741cec 100644 --- a/services/web/frontend/js/features/share-project-modal/components/share-project-modal-content.js +++ b/services/web/frontend/js/features/share-project-modal/components/share-project-modal-content.js @@ -1,12 +1,11 @@ import React from 'react' import { Button, Modal, Grid } from 'react-bootstrap' -import { Trans, useTranslation } from 'react-i18next' +import { Trans } from 'react-i18next' import ShareModalBody from './share-modal-body' import Icon from '../../../shared/components/icon' import AccessibleModal from '../../../shared/components/accessible-modal' import PropTypes from 'prop-types' import { ReadOnlyTokenLink } from './link-sharing' -import BetaBadge from '../../../shared/components/beta-badge' export default function ShareProjectModalContent({ show, @@ -15,20 +14,11 @@ export default function ShareProjectModalContent({ inFlight, error }) { - const { t } = useTranslation() - - const tooltip = { - id: 'create-file-beta-tooltip', - text: t('beta_badge_tooltip', { feature: 'project sharing' }) - } - return ( -    -