π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Address reviewed decomment follow-ups
Manav Rathi6287d2458964
diff --git a/infra/workers/tail/src/index.ts b/infra/workers/tail/src/index.tsindex d27de20df6..7bcfbdb145 100644--- a/infra/workers/tail/src/index.ts+++ b/infra/workers/tail/src/index.ts@@ -20,7 +20,7 @@ const handleTail = async (events: TraceItem[], env: Env) => {};const hasLogOrException = (event: TraceItem) =>- event.logs.length ?? event.exceptions.length;+ event.logs.length || event.exceptions.length;const pushLogLine = async (timestampMs: number, logLine: string, env: Env) =>await fetch(env.LOKI_PUSH_URL, {diff --git a/web/apps/albums/src/public-album/components/TripLayout/mapHelpers.ts b/web/apps/albums/src/public-album/components/TripLayout/mapHelpers.tsindex 7b2abc1d2c..099873887d 100644--- a/web/apps/albums/src/public-album/components/TripLayout/mapHelpers.ts+++ b/web/apps/albums/src/public-album/components/TripLayout/mapHelpers.ts@@ -216,26 +216,15 @@ export const getMapCenter = (const firstLng =firstCluster.reduce((sum, p) => sum + p.lng, 0) / firstCluster.length;- const isMobile = isMobileDevice();- const timelineWidthRatio = isMobile ? 0.0 : 0.5;-- const degreesPerPixelAtZoom10 = 0.35 / 1000;- const basePixelsToShift =- (window.innerWidth || 1400) * (1 - timelineWidthRatio);- const pixelsToShiftFor20Percent = isMobile- ? basePixelsToShift * 0.6- : basePixelsToShift * 3.0;- const lngShift = pixelsToShiftFor20Percent * degreesPerPixelAtZoom10;-- const adjustedLng = firstLng - lngShift;-- return [firstLat, adjustedLng];+ return offsetLocation(firstLat, firstLng);};export const getLocationPosition = (lat: number,lng: number,-): [number, number] => {+): [number, number] => offsetLocation(lat, lng);++const offsetLocation = (lat: number, lng: number): [number, number] => {const isMobile = isMobileDevice();const timelineWidthRatio = isMobile ? 0.0 : 0.5;const degreesPerPixelAtZoom10 = 0.35 / 1000;diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsxindex de62b89c3a..b8ef07cf08 100644--- a/web/apps/auth/src/pages/auth.tsx+++ b/web/apps/auth/src/pages/auth.tsx@@ -206,12 +206,15 @@ const CodeDisplay: React.FC<CodeDisplayProps> = ({ code, timeOffset }) => {periodMs - ((Date.now() + timeOffset) % periodMs);let interval: ReturnType<typeof setInterval> | undefined;- setTimeout(() => {+ const timeout = setTimeout(() => {regen();interval = setInterval(regen, periodMs);}, timeToNextCode);- return () => interval && clearInterval(interval);+ return () => {+ clearTimeout(timeout);+ if (interval) clearInterval(interval);+ };}, [code, timeOffset, regen]);return (diff --git a/web/apps/auth/src/services/remote.ts b/web/apps/auth/src/services/remote.tsindex 34b3601d2e..7dd15967d7 100644--- a/web/apps/auth/src/services/remote.ts+++ b/web/apps/auth/src/services/remote.ts@@ -118,7 +118,7 @@ export const authenticatorEntityDiff = async (if (timestamp) {// The remote timestamp is in epoch microseconds, while Date.now// and timeOffset are in epoch milliseconds.- timeOffset = Date.now() - Math.floor(timestamp / 1e3);+ timeOffset = Math.floor(timestamp / 1e3) - Date.now();}if (diff.length == 0) break;diff --git a/web/apps/embed/src/components/EmbedFileListWithViewer.tsx b/web/apps/embed/src/components/EmbedFileListWithViewer.tsxindex f56405d302..83988425d9 100644--- a/web/apps/embed/src/components/EmbedFileListWithViewer.tsx+++ b/web/apps/embed/src/components/EmbedFileListWithViewer.tsx@@ -40,14 +40,10 @@ export const EmbedFileListWithViewer: React.FC<[files],);- const handleThumbnailClick = useCallback(- (index: number) => {- setCurrentIndex(index);- setOpenFileViewer(true);- },- // eslint-disable-next-line react-hooks/exhaustive-deps- [files.length],- );+ const handleThumbnailClick = useCallback((index: number) => {+ setCurrentIndex(index);+ setOpenFileViewer(true);+ }, []);const handleCloseFileViewer = useCallback(() => {setOpenFileViewer(false);diff --git a/web/apps/embed/src/pages/_app.tsx b/web/apps/embed/src/pages/_app.tsxindex 2ae0d26617..926ca07394 100644--- a/web/apps/embed/src/pages/_app.tsx+++ b/web/apps/embed/src/pages/_app.tsx@@ -28,7 +28,7 @@ export default function App({ Component, pageProps }: AppProps) {const isRouteChangeInProgress = useIsRouteChangeInProgress();- const { showLoadingBar, hideLoadingBar } = useLoadingBar();+ const { loadingBarRef, showLoadingBar, hideLoadingBar } = useLoadingBar();useEffect(() => {if (isRouteChangeInProgress) {@@ -66,7 +66,7 @@ export default function App({ Component, pageProps }: AppProps) {<BaseContext.Provider value={baseContext}><PhotosAppContext.Provider value={photosAppContextValue}><Component {...pageProps} />- <ThemedLoadingBar ref={{ current: null }} />+ <ThemedLoadingBar ref={loadingBarRef} /></PhotosAppContext.Provider></BaseContext.Provider></ThemeProvider>diff --git a/web/apps/photos/src/services/large-files.ts b/web/apps/photos/src/services/large-files.tsindex 6806a181fa..c84554d9e6 100644--- a/web/apps/photos/src/services/large-files.ts+++ b/web/apps/photos/src/services/large-files.ts@@ -89,7 +89,7 @@ export const deleteSelectedLargeFiles = async (let completedSteps = 0;const totalSteps = 2;const tickProgress = () =>- onProgress((completedSteps++ / totalSteps) * 100);+ onProgress((++completedSteps / totalSteps) * 100);await moveToTrash(filesToTrash);tickProgress();diff --git a/web/packages/accounts-rs/components/utils/use-redirect.ts b/web/packages/accounts-rs/components/utils/use-redirect.tsindex e457d062d3..6ccccc23a7 100644--- a/web/packages/accounts-rs/components/utils/use-redirect.ts+++ b/web/packages/accounts-rs/components/utils/use-redirect.ts@@ -11,5 +11,5 @@ export const useRedirectIfNeedsCredentials = (currentPageSlug: string) => {stashRedirect(currentPageSlug);void router.push("/");}- }, [router]);+ }, [router, currentPageSlug]);};diff --git a/web/packages/accounts-rs/services/accounts-db.ts b/web/packages/accounts-rs/services/accounts-db.tsindex 6931e3c597..5334547688 100644--- a/web/packages/accounts-rs/services/accounts-db.ts+++ b/web/packages/accounts-rs/services/accounts-db.ts@@ -148,7 +148,7 @@ export const savedIsFirstLogin = () => {};export const saveIsFirstLogin = () => {- localStorage.setItem("isFirstLogin", JSON.stringify({ status: true }));+ localStorage.setItem("isFirstLogin", JSON.stringify(true));};export const getAndClearIsFirstLogin = () => {@@ -170,7 +170,7 @@ export const savedJustSignedUp = () => {};export const saveJustSignedUp = () => {- localStorage.setItem("justSignedUp", JSON.stringify({ status: true }));+ localStorage.setItem("justSignedUp", JSON.stringify(true));};export const getAndClearJustSignedUp = () => {diff --git a/web/packages/accounts-rs/services/user.ts b/web/packages/accounts-rs/services/user.tsindex 3475b0aadb..43d375c22b 100644--- a/web/packages/accounts-rs/services/user.ts+++ b/web/packages/accounts-rs/services/user.ts@@ -4,7 +4,6 @@ import {savedLocalUser,savedPartialLocalUser,saveKeyAttributes,- saveSRPAttributes,updateSavedLocalUser,} from "ente-accounts-rs/services/accounts-db";import {@@ -21,7 +20,6 @@ import { ensureMasterKeyFromSession } from "ente-accounts-rs/services/session-stimport {generateSRPSetupAttributes,getAndSaveSRPAttributes,- getSRPAttributes,updateSRPAndKeyAttributes,type UpdatedKeyAttr,} from "ente-accounts-rs/services/srp";@@ -36,7 +34,6 @@ import {saveAuthToken,savedAuthToken,} from "ente-base/token";-import { ensure } from "ente-utils/ensure";import { nullToUndefined } from "ente-utils/transform";import { z } from "zod";import { clearInflightPasskeySessionID } from "./passkey";@@ -379,9 +376,6 @@ export const changePassword = async (password: string) => {await getAndSaveSRPAttributes(user.email);- const srpAttributes = await getSRPAttributes(user.email);- saveSRPAttributes(ensure(srpAttributes));-await generateAndSaveInteractiveKeyAttributes(password,{ ...keyAttributes, ...updatedKeyAttr },diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsxindex 820e108b5d..60800c5997 100644--- a/web/packages/accounts/components/Verify2FACodeForm.tsx+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx@@ -69,8 +69,16 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({value={values.otp}onChange={handleChange("otp")}numInputs={6}+ inputType="tel"renderSeparator={<span>-</span>}- renderInput={(props) => <IndividualInput {...props} />}+ renderInput={(props, index) => (+ <IndividualInput+ {...props}+ autoComplete={index === 0 ? "one-time-code" : "off"}+ name={index === 0 ? "otp" : undefined}+ pattern="[0-9]*"+ />+ )}/>{errors.otp && (<Typography variant="mini" sx={{ color: "critical.main" }}>diff --git a/web/packages/accounts/components/utils/use-redirect.ts b/web/packages/accounts/components/utils/use-redirect.tsindex 7d162946f9..d682ffb789 100644--- a/web/packages/accounts/components/utils/use-redirect.ts+++ b/web/packages/accounts/components/utils/use-redirect.ts@@ -11,5 +11,5 @@ export const useRedirectIfNeedsCredentials = (currentPageSlug: string) => {stashRedirect(currentPageSlug);void router.push("/");}- }, [router]);+ }, [router, currentPageSlug]);};diff --git a/web/packages/accounts/services/accounts-db.ts b/web/packages/accounts/services/accounts-db.tsindex 14058e0a3a..af92957c0b 100644--- a/web/packages/accounts/services/accounts-db.ts+++ b/web/packages/accounts/services/accounts-db.ts@@ -139,7 +139,7 @@ export const savedIsFirstLogin = () => {};export const saveIsFirstLogin = () => {- localStorage.setItem("isFirstLogin", JSON.stringify({ status: true }));+ localStorage.setItem("isFirstLogin", JSON.stringify(true));};export const getAndClearIsFirstLogin = () => {@@ -161,7 +161,7 @@ export const savedJustSignedUp = () => {};export const saveJustSignedUp = () => {- localStorage.setItem("justSignedUp", JSON.stringify({ status: true }));+ localStorage.setItem("justSignedUp", JSON.stringify(true));};export const getAndClearJustSignedUp = () => {diff --git a/web/packages/accounts/services/srp.ts b/web/packages/accounts/services/srp.tsindex 599816b04b..0865b31765 100644--- a/web/packages/accounts/services/srp.ts+++ b/web/packages/accounts/services/srp.ts@@ -136,7 +136,10 @@ const generateSRPClient = async () =>new Promise<SrpClient>((resolve, reject) => {SRP.genKey((err, clientKey) => {- if (err) reject(err);+ if (err) {+ reject(err);+ return;+ }resolve(new SrpClient(SRP.params["4096"],diff --git a/web/packages/accounts/services/user.ts b/web/packages/accounts/services/user.tsindex c5268ac657..71cb39d70f 100644--- a/web/packages/accounts/services/user.ts+++ b/web/packages/accounts/services/user.ts@@ -4,13 +4,11 @@ import {savedLocalUser,savedPartialLocalUser,saveKeyAttributes,- saveSRPAttributes,updateSavedLocalUser,} from "ente-accounts/services/accounts-db";import {generateSRPSetupAttributes,getAndSaveSRPAttributes,- getSRPAttributes,updateSRPAndKeyAttributes,type UpdatedKeyAttr,} from "ente-accounts/services/srp";@@ -36,7 +34,6 @@ import {saveAuthToken,savedAuthToken,} from "ente-base/token";-import { ensure } from "ente-utils/ensure";import { nullToUndefined } from "ente-utils/transform";import { z } from "zod";import { clearInflightPasskeySessionID } from "./passkey";@@ -347,9 +344,6 @@ export const changePassword = async (password: string) => {await getAndSaveSRPAttributes(user.email);- const srpAttributes = await getSRPAttributes(user.email);- saveSRPAttributes(ensure(srpAttributes));-await generateAndSaveInteractiveKeyAttributes(password,{ ...keyAttributes, ...updatedKeyAttr },diff --git a/web/packages/base/components/RowButton.tsx b/web/packages/base/components/RowButton.tsxindex 2da12d58a6..83f2882890 100644--- a/web/packages/base/components/RowButton.tsx+++ b/web/packages/base/components/RowButton.tsx@@ -45,9 +45,7 @@ export const RowButtonGroupHint: React.FC<React.PropsWithChildren> = ({</Typography>);-export const RowButtonDivider = () => (- <Divider sx={{ "&&&": { mttty: 0 }, opacity: 0.4 }} />-);+export const RowButtonDivider = () => <Divider sx={{ opacity: 0.4 }} />;// Group styling only supports primary RowButtons.export const RowButtonGroup = styled("div")(diff --git a/web/packages/base/components/utils/mui-theme.d.ts b/web/packages/base/components/utils/mui-theme.d.tsindex ff58cb174c..b0c7f2de2e 100644--- a/web/packages/base/components/utils/mui-theme.d.ts+++ b/web/packages/base/components/utils/mui-theme.d.ts@@ -38,7 +38,7 @@ declare module "@mui/material/styles" {divider: string;};};- boxShadow: { paper: string; menu: string; button: string };+ boxShadow: { paper: string; menu: string };}interface PaletteOptions {diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.tsindex eee384922e..7ee54b5573 100644--- a/web/packages/base/components/utils/theme.ts+++ b/web/packages/base/components/utils/theme.ts@@ -38,7 +38,7 @@ const getColors = (appName: AppName) => ({: _colors.accentPhotos,accentDark:appName == "ensu"- ? _colors.accentEnsuDark+ ? _colors.accentEnsu: appName == "auth"? _colors.accentAuth: appName == "share" || appName == "locker"@@ -65,7 +65,6 @@ const _colors = {accentAuth: { dark: "#8e0fcb", main: "#9610d6", light: "#8e2de2" },accentShare: { dark: "#0056CC", main: "#1071FF", light: "#1071FF" },accentEnsu: { dark: "#f5d93a", main: "#f5d93a", light: "#f5d93a" },- accentEnsuDark: { dark: "#f5d93a", main: "#f5d93a", light: "#f5d93a" },fixed: {white: "#fff",black: "#000",@@ -108,7 +107,6 @@ const _colors = {boxShadow: {paper: "0px 0px 10px rgba(0 0 0 / 0.25)",menu: "0px 0px 6px rgba(0 0 0 / 0.16), 0px 3px 6px rgba(0 0 0 / 0.12)",- button: "0px 4px 4px rgba(0 0 0 / 0.25)",},},lightEnsu: {@@ -145,7 +143,6 @@ const _colors = {boxShadow: {paper: "0px 0px 10px rgba(0 0 0 / 0.18)",menu: "0px 0px 6px rgba(0 0 0 / 0.14), 0px 3px 6px rgba(0 0 0 / 0.10)",- button: "0px 4px 4px rgba(0 0 0 / 0.18)",},},darkShare: {@@ -182,7 +179,6 @@ const _colors = {boxShadow: {paper: "0px 2px 12px rgba(0 0 0 / 0.75)",menu: "0px 0px 6px rgba(0 0 0 / 0.50), 0px 3px 6px rgba(0 0 0 / 0.25)",- button: "0px 4px 4px rgba(0 0 0 / 0.75)",},},darkEnsu: {@@ -219,7 +215,6 @@ const _colors = {boxShadow: {paper: "0px 2px 12px rgba(0 0 0 / 0.75)",menu: "0px 0px 6px rgba(0 0 0 / 0.50), 0px 3px 6px rgba(0 0 0 / 0.25)",- button: "0px 4px 4px rgba(0 0 0 / 0.75)",},},light: {@@ -256,7 +251,6 @@ const _colors = {boxShadow: {paper: "0px 0px 10px rgba(0 0 0 / 0.25)",menu: "0px 0px 6px rgba(0 0 0 / 0.16), 0px 3px 6px rgba(0 0 0 / 0.12)",- button: "0px 4px 4px rgba(0 0 0 / 0.25)",},},dark: {@@ -293,7 +287,6 @@ const _colors = {boxShadow: {paper: "0px 2px 12px rgba(0 0 0 / 0.75)",menu: "0px 0px 6px rgba(0 0 0 / 0.50), 0px 3px 6px rgba(0 0 0 / 0.25)",- button: "0px 4px 4px rgba(0 0 0 / 0.75)",},},};diff --git a/web/packages/base/i18n-date.ts b/web/packages/base/i18n-date.tsindex 773f70b813..4c71126d1b 100644--- a/web/packages/base/i18n-date.ts+++ b/web/packages/base/i18n-date.ts@@ -68,8 +68,8 @@ export const formattedDateRelative = (const date = toDate(dateOrEpochMicroseconds);- // Math.abs accounts for both past and future scenarios.- const elapsed = Math.abs(date.getTime() - Date.now());+ const elapsed = date.getTime() - Date.now();+ const elapsedMagnitude = Math.abs(elapsed);const relativeTimeFormat = (_relativeTimeFormat ??=new Intl.RelativeTimeFormat(i18n.language, {@@ -79,7 +79,7 @@ export const formattedDateRelative = (}));for (const [u, d] of units) {- if (elapsed > d)+ if (elapsedMagnitude > d)return relativeTimeFormat.format(Math.round(elapsed / d), u);}diff --git a/web/packages/gallery/services/convert-core.ts b/web/packages/gallery/services/convert-core.tsindex 645db2efe4..04b5080446 100644--- a/web/packages/gallery/services/convert-core.ts+++ b/web/packages/gallery/services/convert-core.ts@@ -98,9 +98,11 @@ export const playableVideoURLWeb = async (try {log.info(`Converting ${videoFileName} to mp4`);const convertedBlob = await convertToMP4(videoBlob);- return URL.createObjectURL(+ const convertedURL = URL.createObjectURL(new Blob([convertedBlob], { type: "video/mp4" }),);+ URL.revokeObjectURL(videoObjectURL);+ return convertedURL;} catch (e) {log.error(`Video conversion failed for ${videoFileName}`, e);}diff --git a/web/packages/gallery/services/ffmpeg/index.ts b/web/packages/gallery/services/ffmpeg/index.tsindex 6fcc2e3334..effca26a43 100644--- a/web/packages/gallery/services/ffmpeg/index.ts+++ b/web/packages/gallery/services/ffmpeg/index.ts@@ -200,9 +200,9 @@ export const convertToMP4 = async (const convertToMP4Native = async (electron: Electron, blob: Blob) => {const token = await initiateConvertToMP4(electron, blob);- const mp4Blob = await readVideoStream(electron, token).then((res) =>- res.blob(),- );- await videoStreamDone(electron, token);- return mp4Blob;+ try {+ return await readVideoStream(electron, token).then((res) => res.blob());+ } finally {+ await videoStreamDone(electron, token);+ }};diff --git a/web/packages/gallery/services/ffmpeg/web.ts b/web/packages/gallery/services/ffmpeg/web.tsindex ca83b99902..a297249c82 100644--- a/web/packages/gallery/services/ffmpeg/web.ts+++ b/web/packages/gallery/services/ffmpeg/web.ts@@ -218,7 +218,7 @@ const ffprobeOutput = async (} catch (e) {// Output file might not even exist if the command did not succeed,// so only log on success.- if (status !== 0 && status != -1) {+ if (status === 0 || status == -1) {log.error(`Failed to remove output ${outputPath}`, e);}}diff --git a/web/packages/gallery/services/upload/thumbnail.ts b/web/packages/gallery/services/upload/thumbnail.tsindex b2d0ca3c49..843b7660c4 100644--- a/web/packages/gallery/services/upload/thumbnail.ts+++ b/web/packages/gallery/services/upload/thumbnail.ts@@ -43,30 +43,33 @@ const generateImageThumbnailUsingCanvas = async (blob: Blob) => {const canvasCtx = canvas.getContext("2d")!;const imageURL = URL.createObjectURL(blob);- await withTimeout(- new Promise((resolve, reject) => {- const image = new Image();- image.setAttribute("src", imageURL);- image.onload = () => {- try {- URL.revokeObjectURL(imageURL);- const { width, height } = scaledImageDimensions(- image.width,- image.height,- maxThumbnailDimension,- );- canvas.width = width;- canvas.height = height;- canvasCtx.drawImage(image, 0, 0, width, height);- resolve(undefined);- } catch (e: unknown) {- // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors- reject(e);- }- };- }),- canvasThumbnailGenerationTimeout,- );+ try {+ await withTimeout(+ new Promise((resolve, reject) => {+ const image = new Image();+ image.setAttribute("src", imageURL);+ image.onload = () => {+ try {+ const { width, height } = scaledImageDimensions(+ image.width,+ image.height,+ maxThumbnailDimension,+ );+ canvas.width = width;+ canvas.height = height;+ canvasCtx.drawImage(image, 0, 0, width, height);+ resolve(undefined);+ } catch (e: unknown) {+ // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors+ reject(e);+ }+ };+ }),+ canvasThumbnailGenerationTimeout,+ );+ } finally {+ URL.revokeObjectURL(imageURL);+ }return await compressedJPEGData(canvas);};@@ -116,31 +119,34 @@ export const generateVideoThumbnailUsingCanvas = async (blob: Blob) => {const canvasCtx = canvas.getContext("2d")!;const videoURL = URL.createObjectURL(blob);- await withTimeout(- new Promise((resolve, reject) => {- const video = document.createElement("video");- video.preload = "metadata";- video.src = videoURL;- video.addEventListener("loadeddata", () => {- try {- URL.revokeObjectURL(videoURL);- const { width, height } = scaledImageDimensions(- video.videoWidth,- video.videoHeight,- maxThumbnailDimension,- );- canvas.width = width;- canvas.height = height;- canvasCtx.drawImage(video, 0, 0, width, height);- resolve(undefined);- } catch (e) {- // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors- reject(e);- }- });- }),- canvasThumbnailGenerationTimeout,- );+ try {+ await withTimeout(+ new Promise((resolve, reject) => {+ const video = document.createElement("video");+ video.preload = "metadata";+ video.src = videoURL;+ video.addEventListener("loadeddata", () => {+ try {+ const { width, height } = scaledImageDimensions(+ video.videoWidth,+ video.videoHeight,+ maxThumbnailDimension,+ );+ canvas.width = width;+ canvas.height = height;+ canvasCtx.drawImage(video, 0, 0, width, height);+ resolve(undefined);+ } catch (e) {+ // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors+ reject(e);+ }+ });+ }),+ canvasThumbnailGenerationTimeout,+ );+ } finally {+ URL.revokeObjectURL(videoURL);+ }return await compressedJPEGData(canvas);};diff --git a/web/packages/new/photos/components/ImageEditorOverlay.tsx b/web/packages/new/photos/components/ImageEditorOverlay.tsxindex 9d2dd31bac..d225b7a3eb 100644--- a/web/packages/new/photos/components/ImageEditorOverlay.tsx+++ b/web/packages/new/photos/components/ImageEditorOverlay.tsx@@ -862,11 +862,8 @@ const getCropRegionArgs = (const displayScale = canvasEle.width / canvasRect.width;- // calculate the coordinates of the crop box relative to the canvas and adjust for any scrolling by adding scroll offsets- const x1 =- (cropBoxRect.left - canvasRect.left + window.scrollX) * displayScale;- const y1 =- (cropBoxRect.top - canvasRect.top + window.scrollY) * displayScale;+ const x1 = (cropBoxRect.left - canvasRect.left) * displayScale;+ const y1 = (cropBoxRect.top - canvasRect.top) * displayScale;const x2 = x1 + cropBoxRect.width * displayScale;const y2 = y1 + cropBoxRect.height * displayScale;diff --git a/web/packages/new/photos/services/user-entity/index.ts b/web/packages/new/photos/services/user-entity/index.tsindex 0432867897..4005b6e79b 100644--- a/web/packages/new/photos/services/user-entity/index.ts+++ b/web/packages/new/photos/services/user-entity/index.ts@@ -160,7 +160,7 @@ const getOrCreateEntityKey = async (type: EntityType, masterKey: string) => {// were fetched from remote and then try to decrypt it before doing anything// with it.const generated = await generateEncryptedEntityKey(masterKey);- const result = decryptEntityKey(generated, masterKey);+ const result = await decryptEntityKey(generated, masterKey);await postUserEntityKey(type, generated);await saveRemoteUserEntityKey(type, generated);return result;