admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2025-03-28 (pull request #2237)

Browse Source 
Release/2025 03 28
This commit is contained in:
Dave Richer
2025-04-02 15:39:16 +00:00
parent 1b8be56c15 f556d59ad7
commit 24d47ae1c5
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/App/App.container.jsx
View File

@@ -10,6 +10,7 @@ import client from "../utils/GraphQLClient";
import App from "./App"; import App from "./App";
import * as Sentry from "@sentry/react"; import * as Sentry from "@sentry/react";
import themeProvider from "./themeProvider"; import themeProvider from "./themeProvider";
import { CookiesProvider } from "react-cookie";
// Base Split configuration // Base Split configuration
const config = { const config = {
@@ -38,6 +39,7 @@ function AppContainer() {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<CookiesProvider>
<ApolloProvider client={client}> <ApolloProvider client={client}>
<ConfigProvider <ConfigProvider
input={{ autoComplete: "new-password" }} input={{ autoComplete: "new-password" }}
@@ -58,6 +60,7 @@ function AppContainer() {
</SplitFactoryProvider> </SplitFactoryProvider>
</ConfigProvider> </ConfigProvider>
</ApolloProvider> </ApolloProvider>
</CookiesProvider>
); );
} }

1
client/src/redux/user/user.sagas.js
View File

@@ -340,6 +340,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
args: [], args: [],
imex: () => { imex: () => {
window.$crisp.push(["set", "user:company", [payload.shopname]]); window.$crisp.push(["set", "user:company", [payload.shopname]]);
window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
if (authRecord[0] && authRecord[0].user.validemail) { if (authRecord[0] && authRecord[0].user.validemail) {
window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]); window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
} }