Merge branch 'dev' into cameron/LOOP-4762-alert-management-icon-alignment

Camji55 · Camji55 · commit af427d031353 · 2024-01-22T11:32:59.000-08:00
diff --git a/Loop/Views/SettingsView.swift b/Loop/Views/SettingsView.swift
@@ -82,10 +82,9 @@ public struct SettingsView: View {
                         configurationSection
                     }
                     deviceSettingsSection
-                    // Disables for Coastal HF study
-//                    if FeatureFlags.allowExperimentalFeatures {
-//                        favoriteFoodsSection
-//                    }
+                    if FeatureFlags.allowExperimentalFeatures {
+                        favoriteFoodsSection
+                    }
                     if (viewModel.pumpManagerSettingsViewModel.isTestingDevice || viewModel.cgmManagerSettingsViewModel.isTestingDevice) && viewModel.showDeleteTestData {
                         deleteDataSection
                     }

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,9 @@ public struct SettingsView: View {`
`82`	`82`	`configurationSection`
`83`	`83`	`}`
`84`	`84`	`deviceSettingsSection`
`85`		`- // Disables for Coastal HF study`
`86`		`-// if FeatureFlags.allowExperimentalFeatures {`
`87`		`-// favoriteFoodsSection`
`88`		`-// }`
	`85`	`+ if FeatureFlags.allowExperimentalFeatures {`
	`86`	`+ favoriteFoodsSection`
	`87`	`+ }`
`89`	`88`	`if (viewModel.pumpManagerSettingsViewModel.isTestingDevice \|\| viewModel.cgmManagerSettingsViewModel.isTestingDevice) && viewModel.showDeleteTestData {`
`90`	`89`	`deleteDataSection`
`91`	`90`	`}`