NIT: we prefer early returns to nested inserts

twentyhq · Nov 14, 2024 · 09269ad · 09269ad
1 parent 462a03f
commit 09269ad
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 40 deletions.
diff --git a/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx b/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx
@@ -46,46 +46,51 @@ export const ClientConfigProviderEffect = () => {
   });
 
   useEffect(() => {
-    if (!loading) {
-      if (error !== undefined) {
-        setIsClientConfigLoaded(false);
-        enqueueSnackBar('Unable to reach backend', {
-          variant: SnackBarVariant.Error,
-        });
-        return;
-      }
-      if (isDefined(data?.clientConfig)) {
-        setIsClientConfigLoaded(true);
-        setAuthProviders({
-          google: data?.clientConfig.authProviders.google,
-          microsoft: data?.clientConfig.authProviders.microsoft,
-          password: data?.clientConfig.authProviders.password,
-          magicLink: false,
-          sso: data?.clientConfig.authProviders.sso,
-        });
-        setIsDebugMode(data?.clientConfig.debugMode);
-        setIsAnalyticsEnabled(data?.clientConfig.analyticsEnabled);
-        setIsSignInPrefilled(data?.clientConfig.signInPrefilled);
-        setIsSignUpDisabled(data?.clientConfig.signUpDisabled);
-
-        setBilling(data?.clientConfig.billing);
-        setSupportChat(data?.clientConfig.support);
-
-        setSentryConfig({
-          dsn: data?.clientConfig?.sentry?.dsn,
-          release: data?.clientConfig?.sentry?.release,
-          environment: data?.clientConfig?.sentry?.environment,
-        });
-
-        setCaptchaProvider({
-          provider: data?.clientConfig?.captcha?.provider,
-          siteKey: data?.clientConfig?.captcha?.siteKey,
-        });
-
-        setChromeExtensionId(data?.clientConfig?.chromeExtensionId);
-        setApiConfig(data?.clientConfig?.api);
-      }
+    if (loading) {
+      return;
     }
+
+    if (error instanceof Error) {
+      setIsClientConfigLoaded(false);
+      enqueueSnackBar(`Unable to reach backend: ${error.message}`, {
+        variant: SnackBarVariant.Error,
+      });
+      return;
+    }
+
+    if (!isDefined(data?.clientConfig)) {
+      return;
+    }
+
+    setIsClientConfigLoaded(true);
+    setAuthProviders({
+      google: data?.clientConfig.authProviders.google,
+      microsoft: data?.clientConfig.authProviders.microsoft,
+      password: data?.clientConfig.authProviders.password,
+      magicLink: false,
+      sso: data?.clientConfig.authProviders.sso,
+    });
+    setIsDebugMode(data?.clientConfig.debugMode);
+    setIsAnalyticsEnabled(data?.clientConfig.analyticsEnabled);
+    setIsSignInPrefilled(data?.clientConfig.signInPrefilled);
+    setIsSignUpDisabled(data?.clientConfig.signUpDisabled);
+
+    setBilling(data?.clientConfig.billing);
+    setSupportChat(data?.clientConfig.support);
+
+    setSentryConfig({
+      dsn: data?.clientConfig?.sentry?.dsn,
+      release: data?.clientConfig?.sentry?.release,
+      environment: data?.clientConfig?.sentry?.environment,
+    });
+
+    setCaptchaProvider({
+      provider: data?.clientConfig?.captcha?.provider,
+      siteKey: data?.clientConfig?.captcha?.siteKey,
+    });
+
+    setChromeExtensionId(data?.clientConfig?.chromeExtensionId);
+    setApiConfig(data?.clientConfig?.api);
   }, [
     data,
     setAuthProviders,

diff --git a/packages/twenty-front/src/modules/error-handler/components/GenericErrorFallback.tsx b/packages/twenty-front/src/modules/error-handler/components/GenericErrorFallback.tsx
@@ -39,7 +39,7 @@ export const GenericErrorFallback = ({
           <AnimatedPlaceholder type="errorIndex" />
           <AnimatedPlaceholderEmptyTextContainer>
             <AnimatedPlaceholderEmptyTitle>
-              Server’s on a coffee break
+              Sorry, something went wrong
             </AnimatedPlaceholderEmptyTitle>
             <AnimatedPlaceholderEmptySubTitle>
               {error.message}