chore: fix merge conflicts

apps/api/package.json

@@ -50,9 +50,9 @@
     "@novu/sns": "^0.5.1",
     "@novu/stateless": "^0.5.1",
     "@novu/telnyx": "^0.5.1",
+    "@novu/termii": "^0.5.1",
     "@novu/testing": "^0.5.1",
     "@novu/twilio": "^0.5.1",
-    "@novu/termii": "^0.5.1",
     "@novu/slack": "^0.5.1",
     "@sendgrid/mail": "^7.6.0",
     "@sentry/node": "^6.1.0",
@@ -80,7 +80,7 @@
     "nanoid": "^3.1.20",
     "nest-raven": "^8.1.0",
     "newrelic": "^7.4.0",
-    "passport": "^0.4.1",
+    "passport": "0.6.0",
     "passport-github2": "^0.1.12",
     "passport-jwt": "^4.0.0",
     "passport-oauth2": "^1.6.1",
@@ -113,10 +113,10 @@
     "mocha": "^8.1.1",
     "nodemon": "^2.0.3",
     "sinon": "^9.0.2",
-    "ts-node": "^9.0.0",
-    "typescript": "4.6.2",
     "ts-loader": "9.2.8",
-    "tsconfig-paths": "3.11.0"
+    "ts-node": "^9.0.0",
+    "tsconfig-paths": "3.11.0",
+    "typescript": "4.6.2"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [

apps/web/src/components/templates/DeleteStepModal.tsx

@@ -44,7 +44,7 @@ export function DeleteStepModal({
             <Button variant="outline" size="md" mt={30} onClick={() => cancel()}>
               No
             </Button>
-            <Button mt={30} size="md" onClick={() => confirm()}>
+            <Button mt={30} size="md" onClick={() => confirm()} data-autofocus>
               Yes
             </Button>
           </Group>

apps/web/src/design-system/template-button/ChannelButton.tsx

@@ -10,6 +10,7 @@ import { When } from '../../components/utils/When';
 import { useFormContext } from 'react-hook-form';
 import { useEnvController } from '../../store/use-env-controller';
 import { ChannelTypeEnum } from '@novu/shared';
+import { useClickOutside } from '@mantine/hooks';
 
 const capitalize = (text: string) => {
   return typeof text !== 'string' ? '' : text.charAt(0).toUpperCase() + text.slice(1);
@@ -91,6 +92,7 @@ export function ChannelButton({
   const [disabled, setDisabled] = useState(initDisabled);
   const disabledColor = disabled ? { color: theme.colorScheme === 'dark' ? colors.B40 : colors.B70 } : {};
   const disabledProp = disabled ? { disabled: disabled } : {};
+  const menuRef = useClickOutside(() => setShowDotMenu(false), ['click', 'mousedown', 'touchstart']);
 
   const { watch } = useFormContext();
 
@@ -153,6 +155,7 @@ export function ChannelButton({
                 }}
               >
                 <Menu
+                  ref={menuRef}
                   shadow={theme.colorScheme === 'dark' ? shadows.dark : shadows.light}
                   classNames={menuClasses}
                   withArrow={true}

apps/web/src/design-system/template-button/TemplateButton.styles.ts

@@ -10,7 +10,6 @@ export const useStyles = createStyles((theme) => {
       background: `${dark ? getGradient(colors.B20) : getGradient(colors.white)} padding-box, ${
         colors.horizontal
       } border-box`,
-      border: '1px solid transparent',
       boxShadow: dark ? shadows.dark : shadows.light,
     },
     button: {
@@ -23,6 +22,7 @@ export const useStyles = createStyles((theme) => {
       backgroundColor: dark ? colors.B17 : colors.B98,
       borderRadius: '7px',
       fontWeight: 700,
+      border: '1px solid transparent',
 
       '&:hover': {
         backgroundColor: dark ? colors.B20 : colors.BGLight,

apps/web/src/pages/quick-start/QuickStartPage.tsx

@@ -47,7 +47,7 @@ function QuickStart() {
       </div>
       <Center>
         <Text my={40} color={colors.B60}>
-          <div onClick={onDismissOnboarding} data-test-id="dismiss-onboarding-btn">
+          <div onClick={onDismissOnboarding} style={{ cursor: 'pointer' }} data-test-id="dismiss-onboarding-btn">
             Don't show onboarding guide
           </div>
         </Text>

docs/.gitignore

@@ -18,3 +18,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+.vercel

docs/docs/platform/integrations.md

@@ -23,4 +23,4 @@ For email providers, you will be required to add the following data:
 
 ## Missing a provider?
 
-Novu is an open-source platform, meaning that if you are missing a particular provider you can create the provider best on the guide specified here.
+Novu is an open-source platform, meaning that if you are missing a particular provider you can create one using the guide specified [here](/community/create-provider).

docs/vercel.json

@@ -1,8 +1,9 @@
 {
-  "rewrites": [
+  "redirects": [
     { 
       "source": "/docs/:slug*",
-      "destination": "/:slug*"
+      "destination": "/:slug*",
+      "permanent": true
     }
   ]
 }