Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Handle contacts resolved during family actions

Neeraj Gupta0c9880f0ca90
diff --git a/mobile/apps/photos/lib/ui/family/family_plan_page.dart b/mobile/apps/photos/lib/ui/family/family_plan_page.dart
index 6b70ad1965..ec557a5df7 100644
--- a/mobile/apps/photos/lib/ui/family/family_plan_page.dart
+++ b/mobile/apps/photos/lib/ui/family/family_plan_page.dart
@@ -481,7 +481,7 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
Future<void> _showMemberActions(
FamilyMember member,
- String displayName,
+ String fallbackDisplayName,
) async {
final isCurrentUser =
member.email.trim().toLowerCase() ==
@@ -500,6 +500,10 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
return;
}
+ final savedContactName = savedContact?.data?.name.trim();
+ final displayName = savedContactName == null || savedContactName.isEmpty
+ ? fallbackDisplayName
+ : savedContactName;
final l10n = AppLocalizations.of(context);
await showBottomSheetComponent<void>(
context: context,
diff --git a/mobile/apps/photos/test/ui/family/edit_storage_limit_page_test.dart b/mobile/apps/photos/test/ui/family/edit_storage_limit_page_test.dart
deleted file mode 100644
index ab756b109d..0000000000
--- a/mobile/apps/photos/test/ui/family/edit_storage_limit_page_test.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:photos/ente_theme_data.dart';
-import 'package:photos/generated/l10n.dart';
-import 'package:photos/models/user_details.dart';
-import 'package:photos/ui/family/edit_storage_limit_page.dart';
-
-void main() {
- testWidgets('shows the family listing display name', (tester) async {
- await tester.pumpWidget(
- MaterialApp(
- theme: lightThemeData,
- localizationsDelegates: AppLocalizations.localizationsDelegates,
- supportedLocales: AppLocalizations.supportedLocales,
- home: EditStorageLimitPage(
- member: FamilyMember(
- 1024 * 1024 * 1024,
- 'family-member',
- 42,
- false,
- FamilyMemberStatus.accepted,
- null,
- ),
- displayName: 'Linked person',
- totalStorageInBytes: 10 * 1024 * 1024 * 1024,
- avatarColor: Colors.green,
- ),
- ),
- );
-
- expect(find.text('Linked person'), findsOneWidget);
- expect(find.text('[email protected]'), findsNothing);
- expect(find.text('L'), findsOneWidget);
- });
-}