From e5400cec81cf176acecc7f3e38c56e79f6d4f911 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 29 Jun 2023 17:20:10 +0300
Subject: [PATCH] macOS widgets

---
 lib/data/models/widget_model.dart       |  2 +-
 macos/CompanyIntent/IntentHandler.swift | 21 ++++++---------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/lib/data/models/widget_model.dart b/lib/data/models/widget_model.dart
index aaca59009..1c9461871 100644
--- a/lib/data/models/widget_model.dart
+++ b/lib/data/models/widget_model.dart
@@ -40,7 +40,7 @@ class WidgetData {
         dateRanges = Map.fromIterable(
             DateRange.values.where((value) => value != DateRange.custom),
             key: (dynamic item) => toSnakeCase('$item'),
-            value: (dynamic item) => localization.lookup('$item'));
+            value: (dynamic item) => localization.lookup(toSnakeCase('$item')));
 
   WidgetData.fromJson(Map<String, dynamic> json)
       : url = json['url'],
diff --git a/macos/CompanyIntent/IntentHandler.swift b/macos/CompanyIntent/IntentHandler.swift
index babebb573..785579e2c 100644
--- a/macos/CompanyIntent/IntentHandler.swift
+++ b/macos/CompanyIntent/IntentHandler.swift
@@ -2,27 +2,18 @@ import Intents
 
 class IntentHandler: INExtension, ConfigurationIntentHandling {
     private func loadWidgetData() -> WidgetData {
-        let sharedDefaults = UserDefaults(suiteName: "group.com.invoiceninja.app")
         var widgetData: WidgetData = WidgetData(url: "",
                                                 companyId: "",
                                                 companies: [:],
                                                 dateRanges: [:],
                                                 dashboardFields: [:])
-
-        if let sharedDefaults = sharedDefaults {
-            do {
-                if let shared = sharedDefaults.string(forKey: "widget_data") {
-                    
-                    //print("## Shared: \(shared)")
-                    
-                    let decoder = JSONDecoder()
-                    widgetData = try decoder.decode(WidgetData.self, from: shared.data(using: .utf8)!)
-                }
-            } catch {
-                print(error)
-            }
-        }
         
+        do {
+            widgetData = try getWidgetData()
+        } catch {
+            print(error)
+        }
+                
         return widgetData
     }