Merge branch 'recovery-settings-telemetry-guard' into 'main'

Recovery telemetry guard

See merge request web/clients!25364

Author: MargeBot

applications/account/src/app/containers/securityCheckup/routes/device/EnableDeviceRecoveryContainer.tsx

@@ -26,7 +26,7 @@ const EnableDeviceRecoveryContainer = () => {
     const { securityState } = useSecurityCheckup();
     const { deviceRecovery } = securityState;
     const recoveryFileData = useSelector(selectRecoveryFileData);
-    const updateRecoveryFile = useUpdateRecoveryFile(recoveryFileData);
+    const updateRecoveryFile = useUpdateRecoveryFile(recoveryFileData, { sendSettingEnabledTelemetry: false });
 
     const history = useHistory();
 

applications/account/src/app/containers/securityCheckup/routes/email/SetEmailContainer.tsx

@@ -65,7 +65,7 @@ const SetEmailContainer = () => {
     const { securityState } = useSecurityCheckup();
     const { email } = securityState;
 
-    const accountRecovery = useUpdateAccountRecovery();
+    const accountRecovery = useUpdateAccountRecovery({ sendSettingEnabledTelemetry: false });
 
     if (accountRecovery.data.loading) {
         return <AccountLoaderPage />;

applications/account/src/app/containers/securityCheckup/routes/phone/SetPhoneContainer.tsx

@@ -18,7 +18,7 @@ import { phoneIcon } from '../../methodIcons';
 const SetPhoneContainer = () => {
     const history = useHistory();
 
-    const accountRecovery = useUpdateAccountRecovery();
+    const accountRecovery = useUpdateAccountRecovery({ sendSettingEnabledTelemetry: false });
     const defaultCountry = useMyCountry();
 
     if (accountRecovery.data.loading) {

packages/account/recovery/useUpdateAccountRecovery.tsx

@@ -25,8 +25,15 @@ import { unlockPasswordChanges } from '@proton/shared/lib/api/user';
 import { SETTINGS_STATUS, type UserSettings } from '@proton/shared/lib/interfaces';
 import noop from '@proton/utils/noop';
 
-export const useUpdateAccountRecovery = () => {
-    const { sendRecoverySettingEnabled } = useRecoverySettingsTelemetry();
+interface UseUpdateAccountRecoveryOptions {
+    sendSettingEnabledTelemetry?: boolean;
+}
+
+export const useUpdateAccountRecovery = ({
+    sendSettingEnabledTelemetry = true,
+}: UseUpdateAccountRecoveryOptions = {}) => {
+    const { sendRecoverySettingEnabled: sendRecoverySettingEnabledImpl } = useRecoverySettingsTelemetry();
+    const sendRecoverySettingEnabled = sendSettingEnabledTelemetry ? sendRecoverySettingEnabledImpl : noop;
     const { createNotification } = useNotifications();
 
     const dispatch = useDispatch();

packages/account/recovery/useUpdateRecoveryFile.tsx

@@ -5,14 +5,21 @@ import VoidRecoveryFilesModal from '@proton/components/containers/recovery/VoidR
 import { useRecoverySettingsTelemetry } from '@proton/components/containers/recovery/recoverySettingsTelemetry';
 import { useDispatch } from '@proton/redux-shared-store/sharedProvider';
 
-export const useUpdateRecoveryFile = (recoveryFileData: ReturnType<typeof selectRecoveryFileData>) => {
+interface UseUpdateRecoveryFileOptions {
+    sendSettingEnabledTelemetry?: boolean;
+}
+
+export const useUpdateRecoveryFile = (
+    recoveryFileData: ReturnType<typeof selectRecoveryFileData>,
+    { sendSettingEnabledTelemetry = true }: UseUpdateRecoveryFileOptions = {}
+) => {
     const { sendRecoverySettingEnabled } = useRecoverySettingsTelemetry();
     const dispatch = useDispatch();
     const [voidRecoveryFilesModal, setVoidRecoveryFilesModalOpen, renderVoidRecoveryFilesModal] = useModalState();
 
     const handleChangeDeviceRecoveryToggle = async (checked: boolean) => {
         if (await dispatch(updateDeviceRecoverySettingsThunk({ deviceRecovery: checked }))) {
-            if (checked) {
+            if (checked && sendSettingEnabledTelemetry) {
                 sendRecoverySettingEnabled({ setting: 'device_recovery' });
             }
         }