Revert rawValue key name change for services

Author: ps2

Loop/Managers/Service.swift

@@ -21,7 +21,7 @@ let availableStaticServices = staticServices.map { (Type) -> ServiceDescriptor i
 }
 
 func ServiceFromRawValue(_ rawValue: [String: Any]) -> Service? {
-    guard let serviceIdentifier = rawValue["statefulPluginIdentifier"] as? String,
+    guard let serviceIdentifier = rawValue["serviceIdentifier"] as? String,
         let rawState = rawValue["state"] as? Service.RawStateValue,
         let ServiceType = staticServicesByIdentifier[serviceIdentifier]
     else {

Loop/Managers/ServicesManager.swift

@@ -100,7 +100,7 @@ class ServicesManager {
     }
 
     private func serviceTypeFromRawValue(_ rawValue: Service.RawStateValue) -> Service.Type? {
-        guard let identifier = rawValue["statefulPluginIdentifier"] as? String else {
+        guard let identifier = rawValue["serviceIdentifier"] as? String else {
             return nil
         }
 
@@ -400,3 +400,15 @@ extension ServicesManager: ServiceOnboardingDelegate {
 extension ServicesManager {
     var availableSupports: [SupportUI] { activeServices.compactMap { $0 as? SupportUI } }
 }
+
+// Service extension for rawValue
+extension Service {
+    typealias RawValue = [String: Any]
+
+    var rawValue: RawValue {
+        return [
+            "serviceIdentifier": pluginIdentifier,
+            "state": rawState
+        ]
+    }
+}