From ed938527fdd69c152675d89d94e293bc203d6deb Mon Sep 17 00:00:00 2001
From: keyan <keyan.kousha+huumn@gmail.com>
Date: Mon, 12 Jun 2023 15:37:12 -0500
Subject: [PATCH] simply respect notification alert message

---
 components/notifications.js |  8 +++++---
 pages/settings.js           | 27 +--------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/components/notifications.js b/components/notifications.js
index 95212f8d..f73ae419 100644
--- a/components/notifications.js
+++ b/components/notifications.js
@@ -257,8 +257,10 @@ function NotificationAlert () {
   const pushNotify = useNotification()
 
   useEffect(() => {
-    setShowAlert(!localStorage.getItem('hideNotifyPrompt'))
-  }, [])
+    // basically, we only want to show the alert if the user hasn't interacted with
+    // either opt-in of the double opt-in
+    setShowAlert(pushNotify.isDefault && !localStorage.getItem('hideNotifyPrompt'))
+  }, [pushNotify])
 
   const close = () => {
     localStorage.setItem('hideNotifyPrompt', 'yep')
@@ -268,7 +270,7 @@ function NotificationAlert () {
   return (
     showAlert
       ? (
-        <Alert variant='success' className='text-center' dismissible onClose={close}>
+        <Alert variant='success' dismissible onClose={close}>
           <span className='align-middle'>Enable push notifications?</span>
           <button
             className={`${styles.alertBtn} mx-1`}
diff --git a/pages/settings.js b/pages/settings.js
index 8a6ad7b1..4bef4079 100644
--- a/pages/settings.js
+++ b/pages/settings.js
@@ -17,7 +17,6 @@ import { bech32 } from 'bech32'
 import { NOSTR_MAX_RELAY_NUM, NOSTR_PUBKEY_BECH32 } from '../lib/nostr'
 import { emailSchema, lastAuthRemovalSchema, settingsSchema } from '../lib/validate'
 import { SUPPORTED_CURRENCIES } from '../lib/currency'
-import { useNotification } from '../components/notifications'
 
 export const getServerSideProps = getGetServerSideProps(SETTINGS)
 
@@ -40,7 +39,6 @@ export default function Settings ({ data: { settings } }) {
     }
   }
   )
-  const pushNotify = useNotification()
 
   const { data } = useQuery(SETTINGS)
   if (data) {
@@ -54,7 +52,6 @@ export default function Settings ({ data: { settings } }) {
         <Form
           initial={{
             tipDefault: settings?.tipDefault || 21,
-            pushNotify: pushNotify.isSupported && pushNotify.isGranted,
             turboTipping: settings?.turboTipping,
             fiatCurrency: settings?.fiatCurrency || 'USD',
             noteItemSats: settings?.noteItemSats,
@@ -146,29 +143,7 @@ export default function Settings ({ data: { settings } }) {
             items={SUPPORTED_CURRENCIES}
             required
           />
-          {
-            pushNotify.isSupported
-              ? (
-                <>
-                  <div className='form-label'>notify me</div>
-                  <Checkbox
-                    disabled={pushNotify.isDenied}
-                    label='with push notifications'
-                    name='pushNotify'
-                    groupClassName='mb-0'
-                    handleChange={(val, setValue) => {
-                      val
-                        ? pushNotify.requestPermission(result => {
-                            if (result === 'denied') setValue(false)
-                          })
-                        : pushNotify.withdrawPermission()
-                    }}
-                  />
-                </>
-                )
-              : <div className='form-label'>notify me when ...</div>
-          }
-          <div className='form-label'>when ...</div>
+          <div className='form-label'>notify me when ...</div>
           <Checkbox
             label='I stack sats from posts and comments'
             name='noteItemSats'