ekzyis
/
stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simply respect notification alert message

This commit is contained in:
keyan 2023-06-12 15:37:12 -05:00
parent b71c595856
commit ed938527fd
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/notifications.js
View File

@ -257,8 +257,10 @@ function NotificationAlert () {
const pushNotify = useNotification() const pushNotify = useNotification()
useEffect(() => { 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 = () => { const close = () => {
localStorage.setItem('hideNotifyPrompt', 'yep') localStorage.setItem('hideNotifyPrompt', 'yep')
@ -268,7 +270,7 @@ function NotificationAlert () {
return ( return (
showAlert showAlert
? ( ? (
<Alert variant='success' className='text-center' dismissible onClose={close}> <Alert variant='success' dismissible onClose={close}>
<span className='align-middle'>Enable push notifications?</span> <span className='align-middle'>Enable push notifications?</span>
<button <button
className={`${styles.alertBtn} mx-1`} className={`${styles.alertBtn} mx-1`}

27
pages/settings.js
View File

@ -17,7 +17,6 @@ import { bech32 } from 'bech32'
import { NOSTR_MAX_RELAY_NUM, NOSTR_PUBKEY_BECH32 } from '../lib/nostr' import { NOSTR_MAX_RELAY_NUM, NOSTR_PUBKEY_BECH32 } from '../lib/nostr'
import { emailSchema, lastAuthRemovalSchema, settingsSchema } from '../lib/validate' import { emailSchema, lastAuthRemovalSchema, settingsSchema } from '../lib/validate'
import { SUPPORTED_CURRENCIES } from '../lib/currency' import { SUPPORTED_CURRENCIES } from '../lib/currency'
import { useNotification } from '../components/notifications'
export const getServerSideProps = getGetServerSideProps(SETTINGS) export const getServerSideProps = getGetServerSideProps(SETTINGS)
@ -40,7 +39,6 @@ export default function Settings ({ data: { settings } }) {
} }
} }
) )
const pushNotify = useNotification()
const { data } = useQuery(SETTINGS) const { data } = useQuery(SETTINGS)
if (data) { if (data) {
@ -54,7 +52,6 @@ export default function Settings ({ data: { settings } }) {
<Form <Form
initial={{ initial={{
tipDefault: settings?.tipDefault || 21, tipDefault: settings?.tipDefault || 21,
pushNotify: pushNotify.isSupported && pushNotify.isGranted,
turboTipping: settings?.turboTipping, turboTipping: settings?.turboTipping,
fiatCurrency: settings?.fiatCurrency || 'USD', fiatCurrency: settings?.fiatCurrency || 'USD',
noteItemSats: settings?.noteItemSats, noteItemSats: settings?.noteItemSats,
@ -146,29 +143,7 @@ export default function Settings ({ data: { settings } }) {
items={SUPPORTED_CURRENCIES} items={SUPPORTED_CURRENCIES}
required required
/> />
{ <div className='form-label'>notify me when ...</div>
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>
<Checkbox <Checkbox
label='I stack sats from posts and comments' label='I stack sats from posts and comments'
name='noteItemSats' name='noteItemSats'