Web: Client: Settings: fix after merge

web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/ipSecurity.js

@@ -8,10 +8,10 @@ import RadioButtonGroup from "@appserver/components/radio-button-group";
 import toastr from "@appserver/components/toast/toastr";
 import { LearnMoreWrapper } from "../StyledSecurity";
 import UserFields from "../sub-components/user-fields";
-import Buttons from "../sub-components/buttons";
 import { size } from "@appserver/components/utils/device";
 import { saveToSessionStorage, getFromSessionStorage } from "../../../utils";
 import isEqual from "lodash/isEqual";
+import SaveCancelButtons from "@appserver/components/save-cancel-buttons";
 
 const MainContainer = styled.div`
   width: 100%;
@@ -31,6 +31,10 @@ const MainContainer = styled.div`
   .warning-text {
     margin-bottom: 9px;
   }
+
+  .warning-helper {
+    margin-bottom: 24px;
+  }
 `;
 
 const IpSecurity = (props) => {
@@ -196,13 +200,18 @@ const IpSecurity = (props) => {
       >
         {t("Common:Warning")}!
       </Text>
-      <Text>{t("IPSecurityWarningHelper")}</Text>
+      <Text className="warning-helper">{t("IPSecurityWarningHelper")}</Text>
 
-      <Buttons
-        t={t}
-        showReminder={showReminder}
+      <SaveCancelButtons
+        className="save-cancel-buttons"
         onSaveClick={onSaveClick}
         onCancelClick={onCancelClick}
+        showReminder={showReminder}
+        reminderTest={t("YouHaveUnsavedChanges")}
+        saveButtonLabel={t("Common:SaveButton")}
+        cancelButtonLabel={t("Common:CancelButton")}
+        displaySettings={true}
+        hasScroll={false}
       />
     </MainContainer>
   );

web/ASC.Web.Client/src/store/SettingsSetupStore.js

@@ -62,6 +62,7 @@ class SettingsSetupStore {
     if (authStore.isAuthenticated) {
       await authStore.settingsStore.getPortalPasswordSettings();
       await authStore.tfaStore.getTfaType();
+      await authStore.settingsStore.getIpRestrictions();
     }
   };