Merge pull request #167 from Zextras/2022-11-23-rc

2022 11 23 rc
zextras · Nov 24, 2022 · 08ce5cc · 08ce5cc
2 parents 2ceae11 + eb77d4e
commit 08ce5cc
Show file tree

Hide file tree

Showing 63 changed files with 1,487 additions and 439 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -24,6 +24,7 @@ module.exports = {
 			'i18next-extract',
 			{
 				outputPath: 'translations/{{ns}}.json',
+				defaultContexts: [],
 				defaultNS: 'en',
 				jsonSpace: 4,
 				compatibilityJSON: 'v3'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -101,7 +101,7 @@
 		"@fontsource/roboto": "^4.5.7",
 		"@sentry/browser": "^6.17.7",
 		"@tinymce/tinymce-react": "^3.13.0",
-		"@zextras/carbonio-design-system": "^0.5.1",
+		"@zextras/carbonio-design-system": "^0.5.2",
 		"@zextras/carbonio-ui-preview": "^0.2.4",
 		"darkreader": "4.9.46",
 		"history": "^5.2.0",

diff --git a/src/boot/bootstrapper-router.tsx b/src/boot/bootstrapper-router.tsx
@@ -53,7 +53,7 @@ const DefaultViewsRegister: FC<{ t: TFunction }> = ({ t }) => {
 };
 
 const BootstrapperRouter: FC = () => {
-	const { t } = useTranslation();
+	const [t] = useTranslation();
 	return (
 		<BrowserRouter basename={BASENAME}>
 			<SnackbarManager>

diff --git a/src/boot/init.ts b/src/boot/init.ts
@@ -7,9 +7,10 @@
 import { getInfo } from '../network/get-info';
 import { useAppStore } from '../store/app';
 import { loadApps } from './app/load-apps';
+import { loginConfig } from '../network/login-config';
 
 export const init = (): void => {
-	getInfo().finally(() => {
+	Promise.all([loginConfig(), getInfo()]).finally(() => {
 		loadApps(Object.values(useAppStore.getState().apps));
 	});
 };