SwitchbackTech · tyler-dane · Feb 28, 2026 · Feb 27, 2026 · Feb 27, 2026 · Feb 27, 2026
diff --git a/.github/ISSUE_TEMPLATE/1-feature-request.yml b/.github/ISSUE_TEMPLATE/1-feature-request.yml
@@ -1,4 +1,4 @@
-name: Feature Request ✨
+name: Feature Request
 description: You want something added to the app
 labels: [enhancement]
 projects: [SwitchbackTech/4]
@@ -9,17 +9,6 @@ body:
       value: |
         Thanks for taking the time to fill out this feature request!
 
-  - type: dropdown
-    attributes:
-      label: Priority
-      description: How important is this feature to you?
-      multiple: false
-      options:
-        - Critical (blocking my workflow)
-        - High (would significantly improve my experience)
-        - Medium (nice to have)
-        - Low (minor improvement)
-
   - type: textarea
     attributes:
       label: Feature Description

diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.yml b/.github/ISSUE_TEMPLATE/2-bug-report.yml
@@ -1,4 +1,4 @@
-name: Bug Report 🐞
+name: Bug Report
 description: You found something wrong
 labels: [bug]
 projects: [SwitchbackTech/4]

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
-  - name: 💬 GitHub Discussions
+  - name: GitHub Discussions
     url: https://github.com/SwitchbackTech/compass/discussions
     about: Start a GitHub Discussion for general questions and feedback
-  - name: 📚 Documentation
+  - name: Documentation
     url: https://docs.compasscalendar.com
     about: Check our documentation for setup guides, API reference, and contributing guidelines
diff --git a/e2e/utils/oauth-test-utils.ts b/e2e/utils/oauth-test-utils.ts
@@ -74,13 +74,13 @@ export const setIsSyncing = async (page: Page, value: boolean) => {
 /**
  * Set the awaitingImportResults state in Redux (triggers import phase when true).
  */
-export const setAwaitingImportResults = async (page: Page, value: boolean) => {
-  await page.evaluate((awaitingValue) => {
+export const setIsImportPending = async (page: Page, value: boolean) => {
+  await page.evaluate((isImportPendingValue) => {
     const store = (window as any).__COMPASS_STORE__;
     if (store) {
       store.dispatch({
-        type: "async/importGCal/setAwaitingImportResults",
-        payload: awaitingValue,
+        type: "async/importGCal/setIsImportPending",
+        payload: isImportPendingValue,
       });
     }
   }, value);

diff --git a/packages/web/src/__tests__/utils/state/store.test.util.ts b/packages/web/src/__tests__/utils/state/store.test.util.ts
@@ -122,7 +122,7 @@ export const createInitialState = (
         importing: false,
         importResults: null,
         pendingLocalEventsSynced: null,
-        awaitingImportResults: false,
+        isImportPending: false,
         importError: null,
       },
       importLatest: {

diff --git a/packages/web/src/auth/hooks/oauth/useGoogleAuth.test.ts b/packages/web/src/auth/hooks/oauth/useGoogleAuth.test.ts
@@ -161,7 +161,7 @@ describe("useGoogleAuth", () => {
       );
       expect(mockDispatchFn).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: "async/importGCal/setAwaitingImportResults",
+          type: "async/importGCal/setIsImportPending",
           payload: true,
         }),
       );
@@ -193,7 +193,7 @@ describe("useGoogleAuth", () => {
 
       expect(mockDispatchFn).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: "async/importGCal/setAwaitingImportResults",
+          type: "async/importGCal/setIsImportPending",
           payload: false,
         }),
       );
@@ -252,7 +252,7 @@ describe("useGoogleAuth", () => {
       expect(mockSetAuthenticated).not.toHaveBeenCalled();
       expect(mockDispatchFn).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: "async/importGCal/setAwaitingImportResults",
+          type: "async/importGCal/setIsImportPending",
           payload: false,
         }),
       );
@@ -298,7 +298,7 @@ describe("useGoogleAuth", () => {
 
       expect(mockDispatchFn).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: "async/importGCal/setAwaitingImportResults",
+          type: "async/importGCal/setIsImportPending",
           payload: false,
         }),
       );

diff --git a/packages/web/src/auth/hooks/oauth/useGoogleAuth.ts b/packages/web/src/auth/hooks/oauth/useGoogleAuth.ts
@@ -31,7 +31,7 @@ export function useGoogleAuth() {
     onStart: () => {
       dismissErrorToast(SESSION_EXPIRED_TOAST_ID);
       dispatch(startAuthenticating());
-      dispatch(importGCalSlice.actions.setAwaitingImportResults(true));
+      dispatch(importGCalSlice.actions.setIsImportPending(true));
       dispatch(importGCalSlice.actions.clearImportResults(undefined));
     },
     onSuccess: async (data) => {
@@ -42,7 +42,7 @@ export function useGoogleAuth() {
           dispatch(
             authError(authResult.error?.message || "Authentication failed"),
           );
-          dispatch(importGCalSlice.actions.setAwaitingImportResults(false));
+          dispatch(importGCalSlice.actions.setIsImportPending(false));
           dispatch(importGCalSlice.actions.importing(false));
           return;
         }
@@ -59,7 +59,7 @@ export function useGoogleAuth() {
           dispatch(authSuccess());
           // Now that OAuth is complete, indicate that calendar import is starting
           dispatch(importGCalSlice.actions.importing(true));
-          dispatch(importGCalSlice.actions.setAwaitingImportResults(true));
+          dispatch(importGCalSlice.actions.setIsImportPending(true));
         });
 
         const syncResult = await syncLocalEvents();
@@ -90,7 +90,7 @@ export function useGoogleAuth() {
             error instanceof Error ? error.message : "Authentication failed",
           ),
         );
-        dispatch(importGCalSlice.actions.setAwaitingImportResults(false));
+        dispatch(importGCalSlice.actions.setIsImportPending(false));
         dispatch(importGCalSlice.actions.importing(false));
         throw error; // Re-throw so useGoogleLoginWithSyncOverlay can handle it via onError
       }
@@ -102,7 +102,7 @@ export function useGoogleAuth() {
           error instanceof Error ? error.message : "Authentication failed",
         ),
       );
-      dispatch(importGCalSlice.actions.setAwaitingImportResults(false));
+      dispatch(importGCalSlice.actions.setIsImportPending(false));
       dispatch(importGCalSlice.actions.importing(false));
     },
   });

diff --git a/packages/web/src/components/SyncEventsOverlay/SyncEventsOverlay.test.tsx b/packages/web/src/components/SyncEventsOverlay/SyncEventsOverlay.test.tsx
@@ -3,8 +3,8 @@ import "@testing-library/jest-dom";
 import { render, screen } from "@testing-library/react";
 import { selectIsAuthenticating } from "@web/ducks/auth/selectors/auth.selectors";
 import {
-  selectAwaitingImportResults,
   selectImporting,
+  selectIsImportPending,
 } from "@web/ducks/events/selectors/sync.selector";
 import { useAppSelector } from "@web/store/store.hooks";
 import { SyncEventsOverlay } from "./SyncEventsOverlay";
@@ -33,7 +33,7 @@ describe("SyncEventsOverlay", () => {
       if (selector === selectImporting) {
         return importingValue;
       }
-      if (selector === selectAwaitingImportResults) {
+      if (selector === selectIsImportPending) {
         return awaitingValue;
       }
       if (selector === selectIsAuthenticating) {

diff --git a/packages/web/src/components/SyncEventsOverlay/SyncEventsOverlay.tsx b/packages/web/src/components/SyncEventsOverlay/SyncEventsOverlay.tsx
@@ -3,14 +3,14 @@ import { useBufferedVisibility } from "@web/common/hooks/useBufferedVisibility";
 import { OverlayPanel } from "@web/components/OverlayPanel/OverlayPanel";
 import { selectIsAuthenticating } from "@web/ducks/auth/selectors/auth.selectors";
 import {
-  selectAwaitingImportResults,
   selectImporting,
+  selectIsImportPending,
 } from "@web/ducks/events/selectors/sync.selector";
 import { useAppSelector } from "@web/store/store.hooks";
 
 export const SyncEventsOverlay = () => {
   const importing = useAppSelector(selectImporting);
-  const awaitingImportResults = useAppSelector(selectAwaitingImportResults);
+  const awaitingImportResults = useAppSelector(selectIsImportPending);
   const isAuthenticating = useAppSelector(selectIsAuthenticating);
 
   // Show overlay when:

diff --git a/packages/web/src/ducks/events/selectors/sync.selector.ts b/packages/web/src/ducks/events/selectors/sync.selector.ts
@@ -8,8 +8,8 @@ export const selectImportGCalState = ({ sync }: RootState) => sync.importGCal;
 export const selectImporting = ({ sync }: RootState) =>
   sync.importGCal.importing;
 
-export const selectAwaitingImportResults = ({ sync }: RootState) =>
-  sync.importGCal.awaitingImportResults;
+export const selectIsImportPending = ({ sync }: RootState) =>
+  sync.importGCal.isImportPending;
 
 export const selectImportResults = ({ sync }: RootState) =>
   sync.importGCal.importResults;

diff --git a/packages/web/src/ducks/events/slices/sync.slice.ts b/packages/web/src/ducks/events/slices/sync.slice.ts
@@ -30,7 +30,7 @@ export const importGCalSlice = createAsyncSlice<
     importing: boolean;
     importResults: ImportResults | null;
     pendingLocalEventsSynced: number | null;
-    awaitingImportResults: boolean;
+    isImportPending: boolean;
     importError: string | null;
   }
 >({
@@ -39,15 +39,15 @@ export const importGCalSlice = createAsyncSlice<
     importing: false,
     importResults: null,
     pendingLocalEventsSynced: null,
-    awaitingImportResults: false,
+    isImportPending: false,
     importError: null,
   },
   reducers: {
     importing: (state, action: PayloadAction<boolean>) => {
       state.importing = action.payload;
     },
-    setAwaitingImportResults: (state, action: PayloadAction<boolean>) => {
-      state.awaitingImportResults = action.payload;
+    setIsImportPending: (state, action: PayloadAction<boolean>) => {
+      state.isImportPending = action.payload;
       if (action.payload) {
         state.importError = null;
       }
@@ -63,7 +63,7 @@ export const importGCalSlice = createAsyncSlice<
       }>,
     ) => {
       state.importing = false;
-      state.awaitingImportResults = false;
+      state.isImportPending = false;
       state.importError = null;
       state.importResults = {
         ...action.payload,
@@ -73,7 +73,7 @@ export const importGCalSlice = createAsyncSlice<
     },
     setImportError: (state, action: PayloadAction<string>) => {
       state.importing = false;
-      state.awaitingImportResults = false;
+      state.isImportPending = false;
       state.importError = action.payload;
       state.importResults = null;
       state.pendingLocalEventsSynced = null;

diff --git a/packages/web/src/public/svg/circle.svg b/packages/web/src/public/svg/circle.svg
diff --git a/packages/web/src/socket/client/socket.client.test.ts b/packages/web/src/socket/client/socket.client.test.ts
@@ -65,14 +65,10 @@ describe("socket.client", () => {
   });
 
   describe("reconnect", () => {
-    it("disconnects and then connects after 1 second", () => {
+    it("disconnects and then connects immediately", () => {
       socketClientModule.reconnect();
 
       expect(mockSocket.disconnect).toHaveBeenCalled();
-      expect(mockSocket.connect).not.toHaveBeenCalled();
-
-      jest.advanceTimersByTime(1000);
-
       expect(mockSocket.connect).toHaveBeenCalled();
     });
   });

diff --git a/packages/web/src/socket/client/socket.client.ts b/packages/web/src/socket/client/socket.client.ts
@@ -16,11 +16,7 @@ export const disconnect = () => {
 
 export const reconnect = () => {
   disconnect();
-
-  const timeout = setTimeout(() => {
-    socket.connect();
-    clearTimeout(timeout);
-  }, 1000);
+  socket.connect();
 };
 
 const onError = (error: unknown) => {