refactor: simplify GoogleSheetsSyncDialog

apps/journeys-admin/src/components/AccessDialog/NotificationSwitch/NotificationSwitch.spec.tsx

@@ -55,6 +55,21 @@ describe('NotificationSwitch', () => {
     )
   })
 
+  it('renders without Tooltip when name is not provided', async () => {
+    render(
+      <SnackbarProvider>
+        <MockedProvider>
+          <NotificationSwitch journeyId="journeyId" />
+        </MockedProvider>
+      </SnackbarProvider>
+    )
+
+    fireEvent.mouseOver(screen.getByRole('checkbox'))
+    await waitFor(() =>
+      expect(screen.queryByRole('tooltip')).not.toBeInTheDocument()
+    )
+  })
+
   it('does not update event email notifications when disabled', async () => {
     render(
       <SnackbarProvider>

apps/journeys-admin/src/components/AccessDialog/NotificationSwitch/NotificationSwitch.tsx

@@ -60,16 +60,22 @@ export function NotificationSwitch({
     }
   }
 
+  const switchElement = (
+    <Box>
+      <Switch
+        inputProps={{ 'aria-checked': checked }}
+        checked={checked}
+        onChange={handleChange}
+        disabled={loading || disabled}
+      />
+    </Box>
+  )
+
+  if (name == null) return switchElement
+
   return (
     <Tooltip title={t('Only {{ name }} can change this', { name })}>
-      <Box>
-        <Switch
-          inputProps={{ 'aria-checked': checked }}
-          checked={checked}
-          onChange={handleChange}
-          disabled={loading || disabled}
-        />
-      </Box>
+      {switchElement}
     </Tooltip>
   )
 }

apps/journeys-admin/src/components/Google/GoogleCreateIntegration/GoogleCreateIntegration.tsx

@@ -112,6 +112,11 @@ export function GoogleCreateIntegration(): ReactElement {
           preventDuplicate: true
         })
       }
+      const fallbackPath =
+        returnTo != null && returnTo !== ''
+          ? returnTo
+          : `/teams/${teamId}/integrations`
+      await router.push(fallbackPath)
     } finally {
       setLoading(false)
     }