Merge branch 'develop' into rc

* develop:
  fix dark mode scrollbars for windows
  .
  store roles when creating a user doc
This commit is contained in:
Sidney Alcantara
2022-06-21 12:27:01 +10:00
2 changed files with 5 additions and 1 deletions

View File

@@ -35,6 +35,9 @@ export function useSettingsDocs() {
{ updateDataAtom: updateProjectSettingsAtom }
);
const roles =
JSON.parse((currentUser as any)?.reloadUserInfo?.customAttributes ?? "{}")
?.roles ?? [];
// Store user settings in atom when a user is signed in
useFirestoreDocWithAtom(userSettingsAtom, globalScope, USERS, {
pathSegments: [currentUser?.uid],
@@ -46,6 +49,7 @@ export function useSettingsDocs() {
photoURL: currentUser.photoURL || undefined,
phoneNumber: currentUser.phoneNumber || undefined,
},
roles,
}
: undefined,
updateDataAtom: updateUserSettingsAtom,

View File

@@ -193,7 +193,7 @@ export const colorsDark = (
components: {
MuiCssBaseline: {
styleOverrides: {
// ":root": { colorScheme: "dark" },
":root": { colorScheme: "dark" },
"#root": { backgroundColor: bgDefault.toHslString() },
".rdg": { colorScheme: "dark" },
},