Merge branch 'master' into pr/1946

stackernews · Mar 6, 2025 · af4470a · af4470a
2 parents 6d05682 + 4dd9088
commit af4470a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/components/notifications.js b/components/notifications.js
@@ -733,7 +733,10 @@ export function NotificationAlert () {
     error
       ? (
         <Alert variant='danger' dismissible onClose={() => setError(null)}>
-          <span>{error.toString()}</span>
+          <span>{navigator?.brave && error.name === 'AbortError'
+            ? 'Push registration failed. Enable "Use Google services for push messaging" in Brave\'s privacy settings and try again.'
+            : error.toString()}
+          </span>
         </Alert>
         )
       : showAlert

diff --git a/next.config.js b/next.config.js
@@ -220,6 +220,7 @@ module.exports = withPlausibleProxy()({
             'process.env.NEXT_PUBLIC_NORMAL_POLL_INTERVAL': JSON.stringify(process.env.NEXT_PUBLIC_NORMAL_POLL_INTERVAL),
             'process.env.NEXT_PUBLIC_LONG_POLL_INTERVAL': JSON.stringify(process.env.NEXT_PUBLIC_LONG_POLL_INTERVAL),
             'process.env.NEXT_PUBLIC_EXTRA_LONG_POLL_INTERVAL': JSON.stringify(process.env.NEXT_PUBLIC_EXTRA_LONG_POLL_INTERVAL),
+            'process.env.SANCTIONED_COUNTRY_CODES': JSON.stringify(process.env.SANCTIONED_COUNTRY_CODES),
             'process.env.NEXT_IS_EXPORT_WORKER': 'true'
           })
         ]

diff --git a/sw/index.js b/sw/index.js
@@ -33,7 +33,7 @@ setDefaultHandler(new NetworkOnly({
   plugins: [{
     fetchDidFail: async (args) => {
       //  tell us why a request failed in dev
-      process.env.NODE_ENV !== 'production' && console.log('fetch did fail', ...args)
+      // process.env.NODE_ENV !== 'production' && console.log('fetch did fail', ...args)
     },
     fetchDidSucceed: async ({ request, response, event, state }) => {
       if (