Sync fork with official Ente aac8ee79eb - #9
Merged
Merged
Conversation
Use centralized shared-collection resolution so the selector excludes deleted collections.
…te selection path
…memories # Conflicts: # mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart # mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
## Description - Comments and reaction on memories - Move comment and reaction button
…nte#11607) ## Description When a user creates a new account with no favorites collection, uploads a file, and favorites it from the file viewer - the favorites collection gets created only on the server. IndexedDB isn't updated since that sync happens on file viewer closure. If the user unfavorites the file without closing the file viewer, the code checks the local IndexedDB for the favorites collection, which isn't there yet (pull hasn't happened). This causes the "Something went wrong" modal to pop up. **Fix:** introduced two temp variables to hold the reference to the collection and the promise. if IndexedDB returns undefined/null, we check these instead of showing the error and do the unfavoriting.
- Keep used storage visually distinct from remaining capacity. - Prefer saved contact names, then linked Person names, over email. Validation: Mobile lint workflow passed locally.
# Conflicts: # .github/workflows/rust-lint.yml # .github/workflows/warm-caches.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upstream synchronization
046dd91ad7df94ec8f5673c66a90225ba8bd9f9daac8ee79eb713c16122f1f2664484b22cdda8c0886565f1c2f509a741ca3d081db9e69175dc96485This pull request was created by the guarded local upstream synchronizer. It was not merged automatically.