Fix errors

web/apps/photos/src/components/DeleteAccountModal.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { logoutUser } from "@ente/accounts/services/user";
 import DialogBoxV2 from "@ente/shared/components/DialogBoxV2";
 import EnteButton from "@ente/shared/components/EnteButton";

web/apps/photos/src/components/MachineLearning/MLSearchSettings/index.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { Box, DialogProps, Typography } from "@mui/material";
 import { EnteDrawer } from "components/EnteDrawer";
 import { t } from "i18next";

web/apps/photos/src/components/PhotoViewer/FileInfo/RenderCreationTime.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import { formatDate, formatTime } from "@ente/shared/time/format";
 import CalendarTodayIcon from "@mui/icons-material/CalendarToday";

web/apps/photos/src/components/PhotoViewer/FileInfo/RenderFileName.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import PhotoOutlined from "@mui/icons-material/PhotoOutlined";
 import VideocamOutlined from "@mui/icons-material/VideocamOutlined";

web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import {
     Backdrop,
     Box,

web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import ChevronRight from "@mui/icons-material/ChevronRight";
 import ScienceIcon from "@mui/icons-material/Science";
 import { Box, DialogProps, Stack, Typography } from "@mui/material";

web/apps/photos/src/components/Sidebar/UtilitySection.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import RecoveryKey from "@ente/shared/components/RecoveryKey";
 import {
     ACCOUNTS_PAGES,

web/apps/photos/src/components/Upload/Uploader.tsx

@@ -1,4 +1,5 @@
 import log from "@/next/log";
+import type { Electron } from "@/next/types/ipc";
 import { CustomError } from "@ente/shared/error";
 import { isPromise } from "@ente/shared/utils";
 import DiscFullIcon from "@mui/icons-material/DiscFull";

web/apps/photos/src/components/pages/gallery/PlanSelector/card/index.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { SUPPORT_EMAIL } from "@ente/shared/constants/urls";
 import { useLocalState } from "@ente/shared/hooks/useLocalState";
 import { LS_KEYS } from "@ente/shared/storage/localStorage";

web/apps/photos/src/components/pages/gallery/PreviewCard.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { Overlay } from "@ente/shared/components/Container";
 import { CustomError } from "@ente/shared/error";
 import useLongPress from "@ente/shared/hooks/useLongPress";

web/apps/photos/src/pages/index.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import Login from "@ente/accounts/components/Login";
 import SignUp from "@ente/accounts/components/SignUp";
 import { APPS } from "@ente/shared/apps/constants";

web/apps/photos/src/pages/shared-albums/index.tsx

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import {
     CenteredFlex,
     SpaceBetweenFlex,

web/apps/photos/src/services/deduplicationService.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import HTTPService from "@ente/shared/network/HTTPService";
 import { getEndpoint } from "@ente/shared/network/api";
 import { getToken } from "@ente/shared/storage/localStorage/helpers";

web/apps/photos/src/services/export/index.ts

@@ -1,3 +1,4 @@
+import { ensureElectron } from "@/next/electron";
 import log from "@/next/log";
 import { CustomError } from "@ente/shared/error";
 import { Events, eventBus } from "@ente/shared/events";

web/apps/photos/src/services/heicConversionService.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import WasmHEICConverterService from "./heic-convert/service";
 
 class HeicConversionService {

web/apps/photos/src/services/locationSearchService.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { LocationTagData } from "types/entity";
 import { Location } from "types/upload";
 

web/apps/photos/src/services/machineLearning/blazeFaceDetectionService.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { GraphModel } from "@tensorflow/tfjs-converter";
 import * as tf from "@tensorflow/tfjs-core";
 import {

web/apps/photos/src/services/machineLearning/faceService.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import {
     DetectedFace,
     Face,

web/apps/photos/src/services/machineLearning/imageSceneService.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import * as tfjsConverter from "@tensorflow/tfjs-converter";
 import * as tf from "@tensorflow/tfjs-core";
 import { SCENE_DETECTION_IMAGE_SIZE } from "constants/mlConfig";

web/apps/photos/src/services/machineLearning/machineLearningFactory.ts

@@ -1,4 +1,5 @@
 import { haveWindow } from "@/next/env";
+import log from "@/next/log";
 import { ComlinkWorker } from "@/next/worker/comlink-worker";
 import { getDedicatedCryptoWorker } from "@ente/shared/crypto";
 import { DedicatedCryptoWorker } from "@ente/shared/crypto/internal/crypto.worker";

web/apps/photos/src/services/machineLearning/mobileFaceNetEmbeddingService.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import * as tf from "@tensorflow/tfjs-core";
 import { TFLiteModel } from "@tensorflow/tfjs-tflite";
 import { MOBILEFACENET_FACE_SIZE } from "constants/mlConfig";

web/apps/photos/src/services/machineLearning/objectService.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import {
     DetectedObject,
     MLSyncContext,

web/apps/photos/src/services/machineLearning/peopleService.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { Face, MLSyncContext, Person } from "types/machineLearning";
 import {
     findFirstIfSorted,

web/apps/photos/src/services/machineLearning/ssdMobileNetV2Service.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import * as tf from "@tensorflow/tfjs-core";
 import {
     ObjectDetection,

web/apps/photos/src/utils/common/job.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { JobConfig, JobResult, JobState } from "types/common/job";
 
 export class SimpleJob<R extends JobResult> {

web/apps/photos/src/utils/machineLearning/faceCrop.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { CacheStorageService } from "@ente/shared/storage/cacheStorage";
 import { CACHES } from "@ente/shared/storage/cacheStorage/constants";
 import { getBlobFromCache } from "@ente/shared/storage/cacheStorage/helpers";

web/apps/photos/src/utils/machineLearning/index.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import { CACHES } from "@ente/shared/storage/cacheStorage/constants";
 import { cached } from "@ente/shared/storage/cacheStorage/helpers";
 import * as tf from "@tensorflow/tfjs-core";

web/packages/accounts/api/srp.ts

@@ -1,3 +1,4 @@
+import log from "@/next/log";
 import HTTPService from "@ente/shared/network/HTTPService";
 import { getEndpoint } from "@ente/shared/network/api";
 

web/packages/shared/components/Menu/EnteMenuItem.tsx

@@ -12,18 +12,11 @@ import {
 import React from "react";
 import { CaptionedText } from "../CaptionedText";
 import PublicShareSwitch from "../Collections/CollectionShare/publicShare/switch";
-import ChangeDirectoryOption from "../Directory/changeOption";
 
 interface Iprops {
     onClick: () => void;
     color?: ButtonProps["color"];
-    variant?:
-        | "primary"
-        | "captioned"
-        | "toggle"
-        | "secondary"
-        | "mini"
-        | "path";
+    variant?: "primary" | "captioned" | "toggle" | "secondary" | "mini";
     fontWeight?: TypographyProps["fontWeight"];
     startIcon?: React.ReactNode;
     endIcon?: React.ReactNode;
@@ -49,14 +42,14 @@ export function EnteMenuItem({
     disabled = false,
 }: Iprops) {
     const handleButtonClick = () => {
-        if (variant === "path" || variant === "toggle") {
+        if (variant === "toggle") {
             return;
         }
         onClick();
     };
 
     const handleIconClick = () => {
-        if (variant !== "path" && variant !== "toggle") {
+        if (variant !== "toggle") {
             return;
         }
         onClick();
@@ -116,11 +109,6 @@ export function EnteMenuItem({
                             onClick={handleIconClick}
                         />
                     )}
-                    {variant === "path" && (
-                        <ChangeDirectoryOption
-                            changeExportDirectory={handleIconClick}
-                        />
-                    )}
                 </VerticallyCenteredFlex>
             </SpaceBetweenFlex>
         </MenuItem>

web/packages/shared/crypto/helpers.ts

@@ -1,4 +1,3 @@
-import ElectronAPIs from "@/next/electron";
 import log from "@/next/log";
 import { setRecoveryKey } from "@ente/accounts/api/user";
 import { LS_KEYS, getData, setData } from "@ente/shared/storage/localStorage";
@@ -6,7 +5,6 @@ import { getToken } from "@ente/shared/storage/localStorage/helpers";
 import { SESSION_KEYS, setKey } from "@ente/shared/storage/sessionStorage";
 import { getActualKey } from "@ente/shared/user";
 import { KeyAttributes } from "@ente/shared/user/types";
-import isElectron from "is-electron";
 import ComlinkCryptoWorker from ".";
 
 const LOGIN_SUB_KEY_LENGTH = 32;
@@ -103,12 +101,9 @@ export const saveKeyInSessionStore = async (
     const sessionKeyAttributes =
         await cryptoWorker.generateKeyAndEncryptToB64(key);
     setKey(keyType, sessionKeyAttributes);
-    if (
-        isElectron() &&
-        !fromDesktop &&
-        keyType === SESSION_KEYS.ENCRYPTION_KEY
-    ) {
-        ElectronAPIs.setEncryptionKey(key);
+    const electron = globalThis.electron;
+    if (electron && !fromDesktop && keyType === SESSION_KEYS.ENCRYPTION_KEY) {
+        electron.setEncryptionKey(key);
     }
 };