π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Merge main into codex/subscription-settings-flow
AswinAsok4555c3e25cc3
diff --cc web/apps/photos/src/pages/gallery.tsxindex 0f6783f25e,1bb51af01a..c592162363--- a/web/apps/photos/src/pages/gallery.tsx+++ b/web/apps/photos/src/pages/gallery.tsx@@@ -6,6 -6,8 +6,7 @@@ importCollectionSelector,type CollectionSelectorAttributes,} from "@/components/CollectionSelector";+ import { DesktopWhatsNew } from "@/components/DesktopWhatsNew";-import { FamilyManagement } from "@/components/FamilyManagement";import type { FileListHeaderOrFooter } from "@/components/FileList";import { FileListWithViewer } from "@/components/FileListWithViewer";import { FixCreationTime } from "@/components/FixCreationTime";@@@ -299,8 -306,12 +304,6 @@@ const Page: React.FC = () =>const pendingPeopleSearchReset = useRef<(() => void) | undefined>(undefined,);- const { show: showWhatsNew, props: whatsNewVisibilityProps } =- const { show: showPlanSelector, props: planSelectorVisibilityProps } =-- useModalVisibility();- const {- show: showFamilyManagement,- props: familyManagementVisibilityProps,- } = useModalVisibility();const { show: showFixCreationTime, props: fixCreationTimeVisibilityProps } =useModalVisibility();const {@@@ -2495,11 -2571,17 +2535,11 @@@onShowDuplicates={handleShowDuplicates}pendingAction={pendingSidebarAction}onActionHandled={handleSidebarActionHandled}- onShowPlanSelector={showPlanSelector}collectionNameByID={collectionNameByID}- onCloseOverlays={closeSidebarOverlays}+ setLoading={setBlockingLoad}onAuthenticateUser={authenticateUser}- >- {(onRootClose) =>- sidebarVisibilityProps.open &&- renderSubscriptionDialogs(onRootClose)- }- </Sidebar>+ />- <WhatsNew {...whatsNewVisibilityProps} />+ <DesktopWhatsNew /><PeopleConsentDialog{...peopleConsentVisibilityProps}onClose={() => {