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

Merge branch 'release/2025-03-28' into feature/IO-2885-IntelliPay-App-Postback-Support

Browse Source
This commit is contained in:
Dave Richer
2025-04-02 11:50:42 -04:00
parent 09c4662436 f556d59ad7
commit cec60db78c
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
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,26 +39,28 @@ function AppContainer() {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<ApolloProvider client={client}> <CookiesProvider>
<ConfigProvider <ApolloProvider client={client}>
input={{ autoComplete: "new-password" }} <ConfigProvider
locale={enLocale} input={{ autoComplete: "new-password" }}
theme={themeProvider} locale={enLocale}
form={{ theme={themeProvider}
validateMessages: { form={{
// eslint-disable-next-line no-template-curly-in-string validateMessages: {
required: t("general.validation.required", { label: "${label}" }) // eslint-disable-next-line no-template-curly-in-string
} required: t("general.validation.required", { label: "${label}" })
}} }
> }}
<GlobalLoadingBar /> >
<SplitFactoryProvider config={config}> <GlobalLoadingBar />
<SplitClientProvider> <SplitFactoryProvider config={config}>
<App /> <SplitClientProvider>
</SplitClientProvider> <App />
</SplitFactoryProvider> </SplitClientProvider>
</ConfigProvider> </SplitFactoryProvider>
</ApolloProvider> </ConfigProvider>
</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]]);
} }