diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart index 28e5749ec..2cc27fa83 100644 --- a/lib/data/models/company_model.dart +++ b/lib/data/models/company_model.dart @@ -1204,6 +1204,18 @@ abstract class UserSettingsEntity } } + String get validatedAccentColor { + if ((accentColor ?? '').isEmpty) { + return kDefaultAccentColor; + } + + if (accentColor.toLowerCase() == '#ffffff') { + return kDefaultAccentColor; + } + + return accentColor; + } + // ignore: unused_element static void _initializeBuilder(UserSettingsEntityBuilder builder) => builder ..accentColor = kDefaultAccentColor diff --git a/lib/ui/app/window_manager.dart b/lib/ui/app/window_manager.dart index ac3d65690..ca7e1968a 100644 --- a/lib/ui/app/window_manager.dart +++ b/lib/ui/app/window_manager.dart @@ -157,7 +157,7 @@ class WidgetCompany { : id = userCompanyState.userCompany.company.id, name = userCompanyState.userCompany.company.displayName, token = userCompanyState.userCompany.token.token, - accentColor = userCompanyState.userCompany.settings.accentColor, + accentColor = userCompanyState.userCompany.settings.validatedAccentColor, firstMonthOfYear = parseInt(userCompanyState.userCompany.company.firstMonthOfYear), currencyId = userCompanyState.userCompany.company.currencyId, diff --git a/macos/DashboardWidget/DashboardWidget.swift b/macos/DashboardWidget/DashboardWidget.swift index 8c4669497..9935b92be 100644 --- a/macos/DashboardWidget/DashboardWidget.swift +++ b/macos/DashboardWidget/DashboardWidget.swift @@ -153,7 +153,6 @@ struct Provider: IntentTimelineProvider { field: label, value: formatter.string(from: NSNumber(value: value))!) - // Next fetch happens 15 minutes later let nextUpdate = Calendar.current.date( byAdding: DateComponents(minute: 15), to: Date() @@ -189,8 +188,6 @@ struct Provider: IntentTimelineProvider { var start: Date = Date() var end: Date = Date() - var dateComponents = calendar.dateComponents([.year, .month, .day], from: Date()) - if (dateRange == "all_time") { start = calendar.date(byAdding: .year, value: -100, to: Date())! } else if (dateRange == "today") {