From b59a0ba823d774b92fa591de612f4ec7cba6fa8c Mon Sep 17 00:00:00 2001
From: matias-portainer <104775949+matias-portainer@users.noreply.github.com>
Date: Mon, 12 Dec 2022 15:11:12 -0300
Subject: [PATCH] fix(settings): fix settings save/update EE-3604 (#8180)

---
 .../views/settings/settingsController.js      |  1 +
 .../DeploymentSyncOptions.tsx                 | 24 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/portainer/views/settings/settingsController.js b/app/portainer/views/settings/settingsController.js
index 2cd70633d..3db3eca34 100644
--- a/app/portainer/views/settings/settingsController.js
+++ b/app/portainer/views/settings/settingsController.js
@@ -174,6 +174,7 @@ angular.module('portainer.app').controller('SettingsController', [
         LogoURL: $scope.formValues.customLogo ? $scope.settings.LogoURL : '',
         EnableTelemetry: $scope.formValues.enableTelemetry,
         TemplatesURL: $scope.settings.TemplatesURL,
+        EdgeAgentCheckinInterval: $scope.settings.EdgeAgentCheckinInterval,
       };
 
       $scope.state.actionInProgress = true;
diff --git a/app/react/portainer/settings/EdgeComputeView/DeploymentSyncOptions/DeploymentSyncOptions.tsx b/app/react/portainer/settings/EdgeComputeView/DeploymentSyncOptions/DeploymentSyncOptions.tsx
index 47abdf0c8..45c101c99 100644
--- a/app/react/portainer/settings/EdgeComputeView/DeploymentSyncOptions/DeploymentSyncOptions.tsx
+++ b/app/react/portainer/settings/EdgeComputeView/DeploymentSyncOptions/DeploymentSyncOptions.tsx
@@ -60,6 +60,18 @@ export function DeploymentSyncOptions() {
           >
             {({ errors, setFieldValue, values, isValid, dirty }) => (
               <Form className="form-horizontal">
+                <FormSection title="Check-in Intervals">
+                  <EdgeCheckinIntervalField
+                    value={values.EdgeAgentCheckinInterval}
+                    onChange={(value) =>
+                      setFieldValue('EdgeAgentCheckinInterval', value)
+                    }
+                    isDefaultHidden
+                    label="Edge agent default poll frequency"
+                    tooltip="Interval used by default by each Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features."
+                  />
+                </FormSection>
+
                 <FormControl
                   inputId="edge_async_mode"
                   label="Use Async mode by default"
@@ -83,18 +95,6 @@ export function DeploymentSyncOptions() {
                   Enabling Async disables the tunnel function.
                 </TextTip>
 
-                <FormSection title="Check-in Intervals">
-                  <EdgeCheckinIntervalField
-                    value={values.EdgeAgentCheckinInterval}
-                    onChange={(value) =>
-                      setFieldValue('EdgeAgentCheckinInterval', value)
-                    }
-                    isDefaultHidden
-                    label="Edge agent default poll frequency"
-                    tooltip="Interval used by default by each Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features."
-                  />
-                </FormSection>
-
                 {values.Edge.AsyncMode && (
                   <FormSection title="Async Check-in Intervals">
                     <EdgeAsyncIntervalsForm