Merge branch 'main' into warren/fix-app-env-var-override-issue

hyperdxio · Sep 21, 2023 · 6e1818a · 6e1818a
2 parents c3d1707 + 36cbc3d
commit 6e1818a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -44,6 +44,14 @@ HYPERDX_API_KEY=<YOUR_INGESTION_API_KEY_HERE> docker compose -f ./docker-compose
 The core services are all hot-reloaded, so you can make changes to the code and
 see them reflected in real-time.
 
+### Windows
+
+If you are running WSL 2, Hot module reload on Nextjs (Frontend) does not work out of the box on windows when run natively on docker. The fix here is to open project directory in WSL and run the above docker compose commands directly in WSL. Note that the project directory should not be under /mnt/c/ directory. You can clone the git repo in /home/{username} for example.
+
+To develop from WSL, follow instructions [here](https://code.visualstudio.com/docs/remote/wsl).
+
+## Additional support
+
 If you need help getting started,
 [join our Discord](https://discord.gg/FErRRKU78j) and we're more than happy to
-get you set up!
+get you set up!
diff --git a/packages/app/src/CreateLogAlertModal.tsx b/packages/app/src/CreateLogAlertModal.tsx
@@ -259,7 +259,7 @@ export default function CreateLogAlertModal({
         },
         onError: () => {
           toast.error(
-            'An error occured. Please contact support for more details.',
+            'An error occurred. Please contact support for more details.',
           );
         },
       });
@@ -354,7 +354,7 @@ export default function CreateLogAlertModal({
                   onSavedSearchCreateSuccess(savedSearch.data);
                 } catch (e) {
                   toast.error(
-                    'An error occured while saving the search for this alert. Please contact support for more details.',
+                    'An error occurred while saving the search for this alert. Please contact support for more details.',
                   );
                   return;
                 }
@@ -381,14 +381,14 @@ export default function CreateLogAlertModal({
                     },
                     onError: () => {
                       toast.error(
-                        'An error occured. Please contact support for more details.',
+                        'An error occurred. Please contact support for more details.',
                       );
                     },
                   },
                 );
               } else {
                 toast.error(
-                  'An error occured while saving the search for this alert. Please contact support for more details.',
+                  'An error occurred while saving the search for this alert. Please contact support for more details.',
                 );
               }
             }}
@@ -433,7 +433,7 @@ export default function CreateLogAlertModal({
                     },
                     onError: () => {
                       toast.error(
-                        'An error occured. Please contact support for more details.',
+                        'An error occurred. Please contact support for more details.',
                       );
                     },
                   },