Use teamid from profile

LoopFollow/Controllers/Nightscout/NSProfile.swift

@@ -51,6 +51,7 @@ struct NSProfile: Decodable {
     let bundleIdentifier: String?
     let isAPNSProduction: Bool?
     let deviceToken: String?
+    let teamID: String?
 
     struct TrioOverrideEntry: Decodable {
         let name: String
@@ -69,5 +70,6 @@ struct NSProfile: Decodable {
         case isAPNSProduction
         case deviceToken
         case trioOverrides = "overrides"
+        case teamID
     }
 }

LoopFollow/Controllers/Nightscout/ProfileManager.swift

@@ -101,6 +101,7 @@ final class ProfileManager {
         Storage.shared.deviceToken.value = profileData.deviceToken ?? ""
         Storage.shared.bundleId.value = profileData.bundleIdentifier ?? ""
         Storage.shared.productionEnvironment.value = profileData.isAPNSProduction ?? false
+        Storage.shared.teamId.value = profileData.teamID ?? Storage.shared.teamId.value ?? ""
     }
 
     func currentISF() -> HKQuantity? {

LoopFollow/Remote/PushNotificationManager.swift

@@ -30,7 +30,7 @@ class PushNotificationManager {
         self.sharedSecret = Storage.shared.sharedSecret.value
         self.productionEnvironment = Storage.shared.productionEnvironment.value
         self.apnsKey = Storage.shared.apnsKey.value
-        self.teamId = Storage.shared.teamId.value
+        self.teamId = Storage.shared.teamId.value ?? ""
         self.keyId = Storage.shared.keyId.value
         self.user = Storage.shared.user.value
         self.bundleId = Storage.shared.bundleId.value
@@ -126,7 +126,6 @@ class PushNotificationManager {
         var missingFields = [String]()
         if sharedSecret.isEmpty { missingFields.append("sharedSecret") }
         if apnsKey.isEmpty { missingFields.append("token") }
-        if teamId.isEmpty { missingFields.append("teamId") }
         if keyId.isEmpty { missingFields.append("keyId") }
         if user.isEmpty { missingFields.append("user") }
 
@@ -139,6 +138,7 @@ class PushNotificationManager {
 
         if deviceToken.isEmpty { missingFields.append("deviceToken") }
         if bundleId.isEmpty { missingFields.append("bundleId") }
+        if teamId.isEmpty { missingFields.append("teamId") }
 
         if !missingFields.isEmpty {
             let errorMessage = "Missing required data, verify that you are using the latest version of Trio: \(missingFields.joined(separator: ", "))"

LoopFollow/Remote/Settings/RemoteSettingsView.swift

@@ -95,14 +95,6 @@ struct RemoteSettingsView: View {
                                 .focused($focusedField, equals: .apnsKey)
                         }
 
-                        HStack {
-                            Text("Team ID")
-                            TextField("Enter Team ID", text: $viewModel.teamId)
-                                .autocapitalization(.none)
-                                .disableAutocorrection(true)
-                                .focused($focusedField, equals: .teamId)
-                                .multilineTextAlignment(.trailing)
-                        }
                     }
 
                     // Guardrails Section

LoopFollow/Remote/Settings/RemoteSettingsViewModel.swift

@@ -15,7 +15,6 @@ class RemoteSettingsViewModel: ObservableObject {
     @Published var user: String
     @Published var sharedSecret: String
     @Published var apnsKey: String
-    @Published var teamId: String
     @Published var keyId: String
 
     @Published var maxBolus: HKQuantity
@@ -31,7 +30,6 @@ class RemoteSettingsViewModel: ObservableObject {
         self.user = storage.user.value
         self.sharedSecret = storage.sharedSecret.value
         self.apnsKey = storage.apnsKey.value
-        self.teamId = storage.teamId.value
         self.keyId = storage.keyId.value
         self.maxBolus = storage.maxBolus.value
         self.maxCarbs = storage.maxCarbs.value
@@ -58,10 +56,6 @@ class RemoteSettingsViewModel: ObservableObject {
             .sink { [weak self] in self?.storage.apnsKey.value = $0 }
             .store(in: &cancellables)
 
-        $teamId
-            .sink { [weak self] in self?.storage.teamId.value = $0 }
-            .store(in: &cancellables)
-
         $keyId
             .sink { [weak self] in self?.storage.keyId.value = $0 }
             .store(in: &cancellables)

LoopFollow/Storage/Storage.swift

@@ -15,7 +15,7 @@ class Storage {
     var sharedSecret = StorageValue<String>(key: "sharedSecret", defaultValue: "")
     var productionEnvironment = StorageValue<Bool>(key: "productionEnvironment", defaultValue: true)
     var apnsKey = StorageValue<String>(key: "apnsKey", defaultValue: "")
-    var teamId = StorageValue<String>(key: "teamId", defaultValue: "")
+    var teamId = StorageValue<String?>(key: "teamId", defaultValue: nil)
     var keyId = StorageValue<String>(key: "keyId", defaultValue: "")
     var bundleId = StorageValue<String>(key: "bundleId", defaultValue: "")
     var user = StorageValue<String>(key: "user", defaultValue: "")