Merge branch 'p1-byoe' into 'main'

Do not show BYOE to sub users

See merge request web/clients!16907

Author: MargeBot

packages/activation/src/components/Modals/ReachedLimitForwardingModal/ReachedLimitForwardingModal.tsx

@@ -1,9 +1,11 @@
 import { c, msgid } from 'ttag';
 
+import { useUser } from '@proton/account/user/hooks';
 import { MAX_SYNC_PAID_USER } from '@proton/activation/src/constants';
 import { Button } from '@proton/atoms';
 import { Prompt } from '@proton/components';
 import type { ModalStateProps } from '@proton/components/components/modalTwo/useModalState';
+import { isAdmin } from '@proton/shared/lib/user/helpers';
 import { useFlag } from '@proton/unleash/index';
 
 const getModalText = (hasAccessToBYOE: boolean) => {
@@ -27,7 +29,9 @@ const getModalText = (hasAccessToBYOE: boolean) => {
 interface Props extends ModalStateProps {}
 
 const ReachedLimitForwardingModal = ({ ...rest }: Props) => {
-    const hasAccessToBYOE = useFlag('InboxBringYourOwnEmail');
+    const [user] = useUser();
+    // Only admins can access to BYOE for now, this will change later
+    const hasAccessToBYOE = useFlag('InboxBringYourOwnEmail') && isAdmin(user);
 
     return (
         <Prompt

packages/activation/src/components/SettingsArea/GmailForwarding.tsx

@@ -1,7 +1,9 @@
 import { c } from 'ttag';
 
+import { useUser } from '@proton/account/user/hooks';
 import ConnectGmailButton from '@proton/activation/src/components/SettingsArea/ConnectGmailButton';
 import { type APP_NAMES, MAIL_APP_NAME } from '@proton/shared/lib/constants';
+import { isAdmin } from '@proton/shared/lib/user/helpers';
 import { useFlag } from '@proton/unleash';
 
 const getFeatureDescription = (hasAccessToBYOE: boolean) => {
@@ -26,7 +28,9 @@ interface Props {
 }
 
 const GmailForwarding = ({ app }: Props) => {
-    const hasAccessToBYOE = useFlag('InboxBringYourOwnEmail');
+    const [user] = useUser();
+    // Only admins can access to BYOE for now, this will change later
+    const hasAccessToBYOE = useFlag('InboxBringYourOwnEmail') && isAdmin(user);
 
     return (
         <>

packages/activation/src/hooks/useSetupGmailBYOEAddress.tsx

@@ -3,6 +3,7 @@ import { useEffect } from 'react';
 import { c } from 'ttag';
 
 import { createBYOEAddress } from '@proton/account/addresses/actions';
+import { useUser } from '@proton/account/user/hooks';
 import {
     G_OAUTH_SCOPE_DEFAULT,
     G_OAUTH_SCOPE_MAIL_FULL_SCOPE,
@@ -16,10 +17,13 @@ import { getAllSync } from '@proton/activation/src/logic/sync/sync.selectors';
 import useNotifications from '@proton/components/hooks/useNotifications';
 import { useDispatch } from '@proton/redux-shared-store/sharedProvider';
 import { getEmailParts } from '@proton/shared/lib/helpers/email';
+import { isAdmin } from '@proton/shared/lib/user/helpers';
 import { useFlag } from '@proton/unleash/index';
 
 const useSetupGmailBYOEAddress = () => {
-    const hasAccessToBYOE = useFlag('InboxBringYourOwnEmail');
+    const [user] = useUser();
+    // Only admins can access to BYOE for now, this will change later
+    const hasAccessToBYOE = useFlag('InboxBringYourOwnEmail') && isAdmin(user);
     const isInMaintenance = useFlag('MaintenanceImporter');
     const easySwitchDispatch = useEasySwitchDispatch();
     const allSyncs = useEasySwitchSelector(getAllSync);

packages/components/containers/addresses/AddressesSection.tsx

@@ -1,6 +1,8 @@
 import { useOrganization } from '@proton/account/organization/hooks';
+import { useUser } from '@proton/account/user/hooks';
 import Loader from '@proton/components/components/loader/Loader';
 import SettingsSectionWide from '@proton/components/containers/account/SettingsSectionWide';
+import { isAdmin } from '@proton/shared/lib/user/helpers';
 import { useFlag } from '@proton/unleash/index';
 
 import Addresses from './Addresses';
@@ -10,8 +12,10 @@ interface Props {
 }
 
 const AddressesSection = ({ isOnlySelf }: Props) => {
+    const [user] = useUser();
     const [organization, loadingOrganization] = useOrganization();
-    const hasAccessToBYOE = useFlag('InboxBringYourOwnEmail');
+    // Only admins can access to BYOE for now, this will change later
+    const hasAccessToBYOE = useFlag('InboxBringYourOwnEmail') && isAdmin(user);
 
     return (
         <SettingsSectionWide>