Fix cannot read property 'ratingCardDidRate2' of undefined on macOS (#…

…346)
webcatalog · Aug 30, 2021 · 6ea451d · 6ea451d
1 parent 5af5f74
commit 6ea451d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/linux-arm64.yml b/.github/workflows/linux-arm64.yml
@@ -57,4 +57,5 @@ jobs:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         REACT_APP_AMPLITUDE_API_KEY: ${{ secrets.REACT_APP_AMPLITUDE_API_KEY }}
         REACT_APP_OCR_SPACE_API_KEY: ${{ secrets.REACT_APP_OCR_SPACE_API_KEY }}
-        ELECTRON_APP_SENTRY_DSN: ${{ secrets.ELECTRON_APP_SENTRY_DSN }}
+        ELECTRON_APP_SENTRY_DSN: ${{ secrets.ELECTRON_APP_SENTRY_DSN }}
+      if: startsWith(github.ref, 'refs/tags/')
diff --git a/.github/workflows/linux-x64.yml b/.github/workflows/linux-x64.yml
@@ -55,4 +55,5 @@ jobs:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         REACT_APP_AMPLITUDE_API_KEY: ${{ secrets.REACT_APP_AMPLITUDE_API_KEY }}
         REACT_APP_OCR_SPACE_API_KEY: ${{ secrets.REACT_APP_OCR_SPACE_API_KEY }}
-        ELECTRON_APP_SENTRY_DSN: ${{ secrets.ELECTRON_APP_SENTRY_DSN }}
+        ELECTRON_APP_SENTRY_DSN: ${{ secrets.ELECTRON_APP_SENTRY_DSN }}
+      if: startsWith(github.ref, 'refs/tags/')
diff --git a/.github/workflows/macos-mas.yml b/.github/workflows/macos-mas.yml
@@ -62,4 +62,5 @@ jobs:
         REACT_APP_AMPLITUDE_API_KEY: ${{ secrets.REACT_APP_AMPLITUDE_API_KEY }}
         REACT_APP_OCR_SPACE_API_KEY: ${{ secrets.REACT_APP_OCR_SPACE_API_KEY }}
         ELECTRON_APP_SENTRY_DSN: ${{ secrets.ELECTRON_APP_SENTRY_DSN }}
-        SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk 
+        SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+      if: startsWith(github.ref, 'refs/tags/')
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -51,4 +51,5 @@ jobs:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         REACT_APP_AMPLITUDE_API_KEY: ${{ secrets.REACT_APP_AMPLITUDE_API_KEY }}
         REACT_APP_OCR_SPACE_API_KEY: ${{ secrets.REACT_APP_OCR_SPACE_API_KEY }}
-        ELECTRON_APP_SENTRY_DSN: ${{ secrets.ELECTRON_APP_SENTRY_DSN }}
+        ELECTRON_APP_SENTRY_DSN: ${{ secrets.ELECTRON_APP_SENTRY_DSN }}
+      if: startsWith(github.ref, 'refs/tags/')
diff --git a/main-src/libs/preferences.js b/main-src/libs/preferences.js
@@ -68,7 +68,7 @@ const initCachedPreferences = () => {
   // ratingCardDidRate2 is only reset on Windows & Linux
   // so transfer old value (ratingCardDidRate) to new value on macOS
   const savedPreferences = settings.getSync(`preferences.${v}`);
-  if (process.platform === 'darwin' && !savedPreferences.ratingCardDidRate2 && savedPreferences.ratingCardDidRate) {
+  if (process.platform === 'darwin' && savedPreferences && !savedPreferences.ratingCardDidRate2 && savedPreferences.ratingCardDidRate) {
     savedPreferences.ratingCardDidRate2 = true;
   }