Merge pull request #2737 from TalaoDAO/october

fix: Add portal even if primary color is not provided #2733
TalaoDAO · Jun 24, 2024 · 6d4a0a5 · 6d4a0a5
2 parents eadfba6 + 6bb5d68
commit 6d4a0a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/dashboard/profile/models/profile_setting.dart b/lib/dashboard/profile/models/profile_setting.dart
@@ -349,7 +349,7 @@ class GeneralOptions extends Equatable {
     required this.published,
     required this.profileId,
     required this.customerPlan,
-    required this.primaryColor,
+    this.primaryColor,
   });
 
   factory GeneralOptions.fromJson(Map<String, dynamic> json) =>
@@ -381,7 +381,7 @@ class GeneralOptions extends Equatable {
   final DateTime published;
   final String profileId;
   final String customerPlan;
-  final String primaryColor;
+  final String? primaryColor;
 
   Map<String, dynamic> toJson() => _$GeneralOptionsToJson(this);
 

diff --git a/lib/theme/app_theme/app_theme.dart b/lib/theme/app_theme/app_theme.dart
@@ -48,8 +48,10 @@ class AppTheme {
     );
   }
 
-  static ThemeData seedThemeData(Brightness brightness, String primaryColor) {
-    if (primaryColor.startsWith('#')) {
+  static ThemeData seedThemeData(Brightness brightness, String? primaryColor) {
+    if (primaryColor == null) {
+      return defaultThemeData(brightness);
+    } else if (primaryColor.startsWith('#')) {
       final seedColor = Color(
         int.parse(primaryColor.substring(1, 7), radix: 16) + 0xFF000000,
       );