Fix after merge

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js

@@ -150,7 +150,7 @@ const PortalIntegration = (props) => {
         <CSP t={t} />
       </CategoryDescription>
       <CategoryHeader>{t("CreateSampleHeader")}</CategoryHeader>
-      <Text lineHeight="20px" color={theme.sdkPresets.secondaryColor}>
+      <Text lineHeight="20px" color={theme.sdkPresets?.secondaryColor}>
         {t("InitializeSDK")}
       </Text>
       <PresetsContainer>

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/StyledPresets.js

@@ -139,7 +139,7 @@ export const Frame = styled(Box)`
   position: relative;
 
   border-radius: 6px;
-  border: 1px solid ${(props) => props.theme.sdkPresets.borderColor};
+  border: 1px solid ${(props) => props.theme.sdkPresets?.borderColor};
 
   width: calc(${(props) => (props.width ? props.width : "100%")} + 2px);
   height: calc(${(props) => (props.height ? props.height : "400px")} + 2px);

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/csp.js

@@ -24,7 +24,7 @@ const Container = styled.div`
 
   &.description-holder {
     display: block;
-    color: ${(props) => props.theme.sdkPresets.secondaryColor};
+    color: ${(props) => props.theme.sdkPresets?.secondaryColor};
   }
 
   &.description-holder > div {

packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/OAuthSectionHeader/index.tsx

@@ -1,9 +1,7 @@
 import { useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 
-// @ts-ignore
-import Headline from "@docspace/common/components/Headline";
-
+import Headline from "@docspace/shared/components/headline/Headline";
 import { IconButton } from "@docspace/shared/components/icon-button";
 
 import ArrowPathReactSvgUrl from "PUBLIC_DIR/images/arrow.path.react.svg?url";

packages/client/src/routes/portalSettings.js

@@ -90,9 +90,15 @@ const ThirdParty = loadable(() =>
     "../pages/PortalSettings/categories/integration/ThirdPartyServicesSettings"
   )
 );
-
-const DocumentService = loadable(() =>
-  import("../pages/PortalSettings/categories/integration/DocumentService")
+const OAuthCreatePage = loadable(() =>
+  import(
+    "../pages/PortalSettings/categories/developer-tools/OAuth/OAuthCreatePage"
+  )
+);
+const OAuthEditPage = loadable(() =>
+  import(
+    "../pages/PortalSettings/categories/developer-tools/OAuth/OAuthEditPage"
+  )
 );
 
 const SingleSignOn = loadable(() =>

packages/runtime.json

@@ -1,7 +1,7 @@
 {
-  "date": "202429_151253",
+  "date": "2024220_125512",
   "checksums": {
-    "api.js": "cdccad9c117fa172ed7ea7f392a6c702",
+    "api.js": "de6605ba5a347753a047d31d2b3daca6",
     "api.poly.js": "586ce6831fa68f6bc33486e2cebc856e",
     "browserDetector.js": "9e853f32d806dd83652ccc2d67510a84",
     "config.json": "3f54595a6ea8207c37f1197069a2db86"

packages/shared/themes/base.ts

@@ -3230,12 +3230,11 @@ export const getBaseTheme = () => {
         headerBorder: "1px solid #d0d5da",
         scopeDesc: "#a3a9ae",
       },
-
+    },
     sdkPresets: {
       borderColor: "#d0d5da",
       secondaryColor: "#657077",
     },
-    },
   };
 };
 

packages/shared/themes/dark.ts

@@ -3207,11 +3207,11 @@ const Dark: TTheme = {
       headerBorder: "1px solid #474747",
       scopeDesc: "#858585",
     },
+  },
   sdkPresets: {
     borderColor: "#474747",
     secondaryColor: "#ADADAD",
   },
-  },
 };
 
 export default Dark;