fix: streak notification message

Fixed streak notification message to show the streak which is at risk of
being lost instead of the current streak (which is always 0 if at risk)

README.md

@@ -17,9 +17,9 @@
 
 ### Manual
 
-Download the latest version of Streaker from the **[GitHub releases](https://github.com/jamieweavis/streaker/releases)** page. (currently macOS & Windows only, track work for Linux support in [#2](https://github.com/jamieweavis/streaker/issues/2))
+Download the latest version of Streaker from the **[GitHub releases](https://github.com/jamieweavis/streaker/releases)** page. (currently macOS & Windows only, track Linux support in [#2](https://github.com/jamieweavis/streaker/issues/2))
 
-### Homebrew Cask
+### Homebrew
 
 Coming soon™, track progress in [#138](https://github.com/jamieweavis/streaker/issues/138)
 

package.json

@@ -36,7 +36,7 @@
   "dependencies": {
     "@primer/components": "23.2.1",
     "auto-launch": "5.0.5",
-    "contribution": "5.0.3",
+    "contribution": "5.2.0",
     "cron": "1.8.2",
     "electron-store": "7.0.3",
     "formik": "2.2.9",

src/main/main.ts

@@ -75,23 +75,15 @@ const bootstrap = (): void => {
 
     let stats: GitHubStats;
     let icon = iconThemes[iconTheme].pending;
+
     try {
       stats = await fetchStats(username);
-      // For screenshots
-      // stats = {
-      //   contributions: {
-      //     best: 42,
-      //     current: 13,
-      //     total: 1337,
-      //   },
-      //   streak: {
-      //     best: 69,
-      //     current: 5,
-      //   },
-      // };
-      if (stats?.streak?.current > 0) icon = iconThemes[iconTheme].contributed;
-      if (stats?.streak?.current === stats?.streak?.best)
+      if (stats.streak.current > 0) {
+        icon = iconThemes[iconTheme].contributed;
+      }
+      if (stats.streak.current === stats.streak.best) {
         icon = iconThemes[iconTheme].streaking;
+      }
     } catch (err) {
       icon = iconThemes[iconTheme].error;
     }
@@ -153,7 +145,7 @@ const bootstrap = (): void => {
   });
 
   // Platform specific app handling
-  app.on('window-all-closed', () => {}); // eslint-disable-line
+  app.on('window-all-closed', () => {});
   if (process.platform === 'darwin') app.dock.hide();
 
   // Save preferences to store on renderer preferences save
@@ -167,10 +159,10 @@ const triggerReminderNotification = async (): Promise<void> => {
   if (!Notification.isSupported()) return;
   const username = store.get('username');
   const stats = await fetchStats(username);
-  if (stats?.contributions?.current === 0 && stats?.streak?.current > 0) {
+  if (stats.streak.isAtRisk) {
     new Notification({
       title: `🔥 Don't lose your streak!`,
-      body: `Contribute today to continue your ${stats.streak.current} day streak on GitHub`,
+      body: `Contribute today to continue your ${stats.streak.previous} day streak on GitHub`,
     }).show();
   }
 };

src/main/menu.ts

@@ -34,22 +34,22 @@ export const createMenu = ({
     },
     { type: 'separator' },
     { label: 'Streak:', enabled: false },
-    { label: `    Best: ${stats?.streak?.best || 0}`, enabled: false },
+    { label: `    Best: ${stats.streak.best}`, enabled: false },
     {
-      label: `    Current: ${stats?.streak?.current || 0}`,
+      label: `    Current: ${stats.streak.current}`,
       enabled: false,
     },
     { label: 'Contributions:', enabled: false },
     {
-      label: `    Best: ${stats?.contributions?.best || 0}`,
+      label: `    Best: ${stats.contributions.best}`,
       enabled: false,
     },
     {
-      label: `    Current: ${stats?.contributions?.current || 0}`,
+      label: `    Current: ${stats.contributions.current}`,
       enabled: false,
     },
     {
-      label: `    Total: ${stats?.contributions?.total || 0}`,
+      label: `    Total: ${stats.contributions.total}`,
       enabled: false,
     },
     { type: 'separator' },

src/renderer/components/preferences-form.tsx

@@ -39,7 +39,6 @@ const PreferencesForm = (): JSX.Element => (
         fontWeight="bold"
         fontSize="14px"
         as="label"
-        // eslint-disable-next-line
         // @ts-ignore
         htmlFor="github-username"
         style={{ display: 'block' }}
@@ -74,7 +73,6 @@ const PreferencesForm = (): JSX.Element => (
         fontWeight="bold"
         fontSize="14px"
         as="label"
-        // eslint-disable-next-line
         // @ts-ignore
         htmlFor="launch-at-login"
         style={{ display: 'block' }}
@@ -88,7 +86,6 @@ const PreferencesForm = (): JSX.Element => (
         fontWeight="bold"
         fontSize="14px"
         as="label"
-        // eslint-disable-next-line
         // @ts-ignore
         htmlFor="notification-enabled"
         style={{ display: 'block' }}
@@ -108,7 +105,6 @@ const PreferencesForm = (): JSX.Element => (
         fontWeight="bold"
         fontSize="14px"
         as="label"
-        // eslint-disable-next-line
         // @ts-ignore
         htmlFor="reminder-time"
         style={{ display: 'block' }}