Merge pull request #2285 from bitfriend/chat-read-receipt

[smallfix] Miscellaneous fixings
acterglobal · Oct 17, 2024 · 3d08912 · 3d08912
2 parents 775f6f0 + 850ff13
commit 3d08912
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/app/lib/common/widgets/sliver_scaffold.dart b/app/lib/common/widgets/sliver_scaffold.dart
@@ -218,6 +218,9 @@ class _SliverFooter extends StatelessWidget {
   }
 
   void onCancel(BuildContext context) {
-    cancelActionOnPressed.map((cb) => cb()) ?? Navigator.pop(context);
+    cancelActionOnPressed.map(
+      (cb) => cb(),
+      orElse: () => Navigator.pop(context),
+    );
   }
 }
diff --git a/app/lib/features/events/pages/create_event_page.dart b/app/lib/features/events/pages/create_event_page.dart
@@ -94,14 +94,18 @@ class CreateEventPageConsumerState extends ConsumerState<CreateEventPage> {
   @override
   void initState() {
     super.initState();
-    widget.templateEvent.map((p0) {
-          WidgetsBinding.instance
-              .addPostFrameCallback((Duration dur) => _setFromTemplate(p0));
-        }) ??
+    widget.templateEvent.map(
+      (p0) => WidgetsBinding.instance.addPostFrameCallback((Duration dur) {
+        _setFromTemplate(p0);
+      }),
+      orElse: () {
         widget.initialSelectedSpace.map((p0) {
-          WidgetsBinding.instance
-              .addPostFrameCallback((Duration dur) => _setSpaceId(p0));
+          WidgetsBinding.instance.addPostFrameCallback((Duration dur) {
+            _setSpaceId(p0);
+          });
         });
+      },
+    );
   }
 
   @override

diff --git a/app/lib/features/events/widgets/event_item.dart b/app/lib/features/events/widgets/event_item.dart
@@ -37,11 +37,13 @@ class EventItem extends StatelessWidget {
     return InkWell(
       onTap: () {
         final eventId = event.eventId().toString();
-        onTapEventItem.map((cb) => cb(eventId)) ??
-            context.pushNamed(
-              Routes.calendarEvent.name,
-              pathParameters: {'calendarId': eventId},
-            );
+        onTapEventItem.map(
+          (cb) => cb(eventId),
+          orElse: () => context.pushNamed(
+            Routes.calendarEvent.name,
+            pathParameters: {'calendarId': eventId},
+          ),
+        );
       },
       child: Stack(
         alignment: Alignment.topLeft,