From e2f0d37eddbb54f5f5531dc5c2fcee2210b55b6a Mon Sep 17 00:00:00 2001
From: peima <pei@toptons.com>
Date: Fri, 24 Jul 2026 20:30:00 +0800
Subject: [PATCH] phase3: generated l10n/messages_all, events, actions, dialog
 null-safe

---
 lib/events/events.dart               | 2 +-
 lib/generated/intl/messages_all.dart | 4 ++--
 lib/generated/l10n.dart              | 4 ++--
 lib/store/actions.dart               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/events/events.dart b/lib/events/events.dart
index 47126fd..90f1323 100644
--- a/lib/events/events.dart
+++ b/lib/events/events.dart
@@ -87,7 +87,7 @@ class OnProductWillAddToCart {
   double price;
   String description;
   Business business;
-  GlobalKey buttonKey;
+  GlobalKey? buttonKey;
   OnProductWillAddToCart(this.product, this.selections, this.price, this.description, this.business, {this.buttonKey});
 }
 
diff --git a/lib/generated/intl/messages_all.dart b/lib/generated/intl/messages_all.dart
index 531e7cd..af9cda2 100644
--- a/lib/generated/intl/messages_all.dart
+++ b/lib/generated/intl/messages_all.dart
@@ -24,7 +24,7 @@ Map<String, LibraryLoader> _deferredLibraries = {
   'zh_CN': () => new Future.value(null),
 };
 
-MessageLookupByLibrary _findExact(String localeName) {
+MessageLookupByLibrary? _findExact(String localeName) {
   switch (localeName) {
     case 'en':
       return messages_en.messages;
@@ -59,7 +59,7 @@ bool _messagesExistFor(String locale) {
   }
 }
 
-MessageLookupByLibrary _findGeneratedMessagesFor(String locale) {
+MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) {
   var actualLocale = Intl.verifiedLocale(locale, _messagesExistFor,
       onFailure: (_) => null);
   if (actualLocale == null) return null;
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index b5ed4b1..85e10bc 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -15,7 +15,7 @@ import 'intl/messages_all.dart';
 class S {
   S();
   
-  static S current;
+  static S current = S();
   
   static const AppLocalizationDelegate delegate =
     AppLocalizationDelegate();
@@ -32,7 +32,7 @@ class S {
   } 
 
   static S of(BuildContext context) {
-    return Localizations.of<S>(context, S);
+    return Localizations.of<S>(context, S) ?? S.current;
   }
 
   /// `About`
diff --git a/lib/store/actions.dart b/lib/store/actions.dart
index 2b96ca6..2c04c0f 100644
--- a/lib/store/actions.dart
+++ b/lib/store/actions.dart
@@ -15,7 +15,7 @@ class UpdateLocale {
 }
 
 class UpdateCurrentUser {
-  final User user;
+  final User? user;
   UpdateCurrentUser(this.user);
 }