add reload badge on sw update

Feature/sw update

src/App.tsx

@@ -9,16 +9,17 @@ import { ModalInitial } from './components/Modal/ModalInitial/ModalInitial'
 import { ModalImportKeys } from './components/Modal/ModalImportKeys/ModalImportKeys'
 import { ModalSignUp } from './components/Modal/ModalSignUp/ModalSignUp'
 import { ModalLogin } from './components/Modal/ModalLogin/ModalLogin'
+import { useSearchParams } from 'react-router-dom'
 
 function App() {
   const [render, setRender] = useState(0)
   const dispatch = useAppDispatch()
+  const [searchParams, setSearchParams] = useSearchParams()
 
   const [isConnected, setIsConnected] = useState(false)
 
   const load = useCallback(async () => {
     const keys: DbKey[] = await dbi.listKeys()
-    // console.log(keys, 'keys')
 
     dispatch(setKeys({ keys }))
     const loadProfiles = async () => {
@@ -55,7 +56,6 @@ function App() {
     // rerender
     //		setRender((r) => r + 1)
 
-    // if (!keys.length) handleOpen(MODAL_PARAMS_KEYS.INITIAL)
     // eslint-disable-next-line
   }, [dispatch])
 
@@ -80,12 +80,14 @@ function App() {
   // subscribe to service worker updates
   swicOnReload(() => {
     console.log('reload')
-    // FIXME show 'Please reload' badge at page top
+    searchParams.set('reload', 'true')
+    setSearchParams(searchParams)
   })
 
   return (
     <>
       <AppRoutes />
+
       <ModalInitial />
       <ModalImportKeys />
       <ModalSignUp />

src/components/Modal/ModalAppDetails/ModalAppDetails.tsx

@@ -68,7 +68,6 @@ export const ModalAppDetails = () => {
     if (isEmptyString(url)) return
 
     try {
-
       const u = new URL(url)
 
       if (isEmptyString(name)) setDetails((prev) => ({ ...prev, name: u.hostname }))

src/components/Modal/ModalConfirmConnect/ModalConfirmConnect.tsx

@@ -73,11 +73,11 @@ export const ModalConfirmConnect = () => {
   useEffect(() => {
     if (isModalOpened) {
       if (isPopup) {
-        console.log("waiting for sw")
+        console.log('waiting for sw')
         // wait for SW to start
         swicWaitStarted().then(() => {
           // give it some time to load the pending reqs etc
-          console.log("waiting for sw done")
+          console.log('waiting for sw done')
           setTimeout(() => setIsLoaded(true), 500)
         })
       } else {
@@ -123,7 +123,6 @@ export const ModalConfirmConnect = () => {
       const options = { perms, appUrl }
       await confirmPending(pendingReqId, true, true, options)
     } else {
-
       try {
         await askNotificationPermission()
         const result = await swicCall('enablePush')

src/components/Modal/ModalEditName/ModalEditName.tsx

@@ -13,7 +13,7 @@ import { DOMAIN } from '@/utils/consts'
 import { fetchNip05 } from '@/utils/helpers/helpers'
 import { Stack, Typography, useTheme } from '@mui/material'
 import { ChangeEvent, Fragment, useCallback, useEffect, useState } from 'react'
-import { useParams, useSearchParams } from 'react-router-dom'
+import { useParams } from 'react-router-dom'
 import { useDebounce } from 'use-debounce'
 import { StyledSettingContainer } from './styled'
 import { SectionTitle } from '@/shared/SectionTitle/SectionTitle'
@@ -55,7 +55,7 @@ export const ModalEditName = () => {
       setIsAvailable(true)
       setIsChecking(false)
     }
-  }, [debouncedName])
+  }, [debouncedName, npub])
 
   useEffect(() => {
     checkIsUsernameAvailable()

src/components/Modal/ModalEditName/styled.tsx

@@ -1,4 +1,4 @@
-import { Stack, StackProps, styled } from "@mui/material";
+import { Stack, StackProps, styled } from '@mui/material'
 
 export const StyledSettingContainer = styled((props: StackProps) => (
   <Stack gap={'0.75rem'} component={'form'} {...props} />

src/components/Modal/ModalSignUp/ModalSignUp.tsx

@@ -60,10 +60,8 @@ export const ModalSignUp = () => {
     try {
       setIsLoading(true)
       const k: any = await swicCall('generateKey', name)
-      if (k.name)
-        notify(`Account created for "${k.name}"`, 'success')
-      else
-        notify(`Failed to assign name "${name}", try again`, 'error')
+      if (k.name) notify(`Account created for "${k.name}"`, 'success')
+      else notify(`Failed to assign name "${name}", try again`, 'error')
       setIsLoading(false)
       setTimeout(() => {
         // give frontend time to read the new key first

src/components/ReloadBadge/ReloadBadge.tsx

@@ -0,0 +1,33 @@
+import { FC } from 'react'
+import { Collapse, Stack, Typography } from '@mui/material'
+import { useSearchParams } from 'react-router-dom'
+import { StyledAlert, StyledReloadButton } from './styled'
+
+const ReloadBadgeContent: FC = () => {
+  const [searchParams, setSearchParams] = useSearchParams()
+
+  const handleReload = () => {
+    searchParams.delete('reload')
+    setSearchParams(searchParams)
+    window.location.reload()
+  }
+  return (
+    <Collapse in>
+      <StyledAlert>
+        <Stack direction={'row'} className="content">
+          <Typography flex={1} className="title">
+            New version available, please reload the page!
+          </Typography>
+          <StyledReloadButton onClick={handleReload}>Reload</StyledReloadButton>
+        </Stack>
+      </StyledAlert>
+    </Collapse>
+  )
+}
+
+export const ReloadBadge = () => {
+  const [searchParams] = useSearchParams()
+  const open = searchParams.get('reload') === 'true'
+
+  return <>{open && <ReloadBadgeContent />}</>
+}

src/components/ReloadBadge/styled.tsx

@@ -0,0 +1,50 @@
+import { AppButtonProps, Button } from '@/shared/Button/Button'
+import { Alert, AlertProps, styled } from '@mui/material'
+import RefreshIcon from '@mui/icons-material/Refresh'
+
+export const StyledAlert = styled((props: AlertProps) => (
+  <Alert {...props} variant="outlined" severity="info" classes={{ message: 'message' }} />
+))(() => {
+  return {
+    height: 'auto',
+    marginTop: '0.5rem',
+    alignItems: 'center',
+    '& .message': {
+      flex: 1,
+      overflow: 'initial',
+    },
+    '& .content': {
+      width: '100%',
+      alignItems: 'center',
+      gap: '1rem',
+    },
+    '& .title': {
+      display: '-webkit-box',
+      WebkitLineClamp: 3,
+      WebkitBoxOrient: 'vertical',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+    },
+    '@media screen and (max-width: 320px)': {
+      '& .title': {
+        fontSize: '14px',
+        WebkitLineClamp: 2,
+      },
+    },
+  }
+})
+
+export const StyledReloadButton = styled((props: AppButtonProps) => <Button startIcon={<RefreshIcon />} {...props} />)(
+  ({ theme }) => {
+    const isDarkTheme = theme.palette.mode === 'dark'
+    return {
+      padding: '0.25rem 1rem',
+      '&.button:is(:hover, :active, &)': {
+        background: isDarkTheme ? '#b8e7fb' : '#014361',
+      },
+      '@media screen and (max-width: 320px)': {
+        padding: '0.25rem 0.5rem',
+      },
+    }
+  }
+)

src/components/Warning/Warning.tsx

@@ -13,14 +13,8 @@ export const Warning: FC<WarningProps> = ({ hint, message, icon, ...restProps })
     <StyledContainer {...restProps}>
       {icon && <IconContainer>{icon}</IconContainer>}
       <Stack flex={1} direction={'column'} gap={'0.2rem'}>
-        <Typography noWrap>
-          {message}
-        </Typography>
-        {hint && (
-          <Typography>
-            {hint}
-          </Typography>
-        )}
+        <Typography noWrap>{message}</Typography>
+        {hint && <Typography>{hint}</Typography>}
       </Stack>
     </StyledContainer>
   )

src/layout/Header/Header.tsx

@@ -1,7 +1,7 @@
-import { Avatar, Stack, Toolbar, Typography } from '@mui/material'
+import { Avatar, Stack, Toolbar, Typography, Divider, DividerProps, styled } from '@mui/material'
 import { StyledAppBar, StyledAppLogo, StyledAppName, StyledProfileContainer, StyledThemeButton } from './styled'
 import { Menu } from './components/Menu'
-import { useNavigate, useParams } from 'react-router-dom'
+import { useNavigate, useParams, useSearchParams } from 'react-router-dom'
 import { ProfileMenu } from './components/ProfileMenu'
 import { useProfile } from '@/hooks/useProfile'
 import DarkModeIcon from '@mui/icons-material/DarkMode'
@@ -13,6 +13,8 @@ export const Header = () => {
   const themeMode = useAppSelector((state) => state.ui.themeMode)
   const navigate = useNavigate()
   const dispatch = useAppDispatch()
+  const [searchParams] = useSearchParams()
+  const needReload = searchParams.get('reload') === 'true'
 
   const { npub = '' } = useParams<{ npub: string }>()
   const { userName, userAvatar, avatarTitle } = useProfile(npub)
@@ -30,7 +32,7 @@ export const Header = () => {
   }
 
   return (
-    <StyledAppBar position="fixed">
+    <StyledAppBar position={needReload ? 'relative' : 'fixed'}>
       <Toolbar sx={{ padding: '12px' }}>
         <Stack direction={'row'} justifyContent={'space-between'} alignItems={'center'} width={'100%'}>
           {showProfile && (
@@ -56,6 +58,15 @@ export const Header = () => {
           {showProfile ? <ProfileMenu /> : <Menu />}
         </Stack>
       </Toolbar>
+      <StyledDivider />
     </StyledAppBar>
   )
 }
+
+const StyledDivider = styled((props: DividerProps) => <Divider {...props} />)({
+  position: 'absolute',
+  bottom: 0,
+  width: '100%',
+  left: 0,
+  height: '2px',
+})

src/layout/Header/components/ListItemProfile.tsx

@@ -7,23 +7,16 @@ type ListItemProfileProps = {
   onClickItem: () => void
 } & DbKey
 
-export const ListItemProfile: FC<ListItemProfileProps> = ({
-	onClickItem,
-	npub,
-}) => {
+export const ListItemProfile: FC<ListItemProfileProps> = ({ onClickItem, npub }) => {
   const { userName, userAvatar, avatarTitle } = useProfile(npub)
   return (
     <MenuItem sx={{ gap: '0.5rem' }} onClick={onClickItem}>
       <ListItemIcon>
-				<Avatar
-					src={userAvatar}
-					alt={userName}
-					sx={{ width: 36, height: 36 }}
-				>
+        <Avatar src={userAvatar} alt={userName} sx={{ width: 36, height: 36 }}>
           {avatarTitle}
         </Avatar>
       </ListItemIcon>
-			<Typography variant='body2' noWrap>
+      <Typography variant="body2" noWrap>
         {userName}
       </Typography>
     </MenuItem>

src/layout/Layout.tsx

@@ -1,13 +1,17 @@
 import { FC } from 'react'
-import { Outlet } from 'react-router-dom'
+import { Outlet, useSearchParams } from 'react-router-dom'
 import { Header } from './Header/Header'
-import { Container, ContainerProps, Divider, DividerProps, styled } from '@mui/material'
+import { Container, ContainerProps, styled } from '@mui/material'
+import { ReloadBadge } from '@/components/ReloadBadge/ReloadBadge'
 
 export const Layout: FC = () => {
+  const [searchParams] = useSearchParams()
+  const needReload = searchParams.get('reload') === 'true'
+
   return (
-    <StyledContainer maxWidth="md">
+    <StyledContainer maxWidth="md" className={needReload ? 'reload' : ''}>
+      <ReloadBadge />
       <Header />
-      <StyledDivider />
       <main>
         <Outlet />
       </main>
@@ -21,17 +25,11 @@ const StyledContainer = styled((props: ContainerProps) => <Container maxWidth="s
   flexDirection: 'column',
   paddingBottom: '1rem',
   position: 'relative',
-  '& > main': {
+  '&': {
     flex: 1,
     maxHeight: '100%',
+  },
+  '&:not(.reload) > main': {
     paddingTop: 'calc(66px + 1rem)',
   },
 })
-
-const StyledDivider = styled((props: DividerProps) => <Divider {...props} />)({
-  position: 'absolute',
-  top: '66px',
-  width: '100%',
-  left: 0,
-  height: '2px',
-})

src/modules/backend.ts

@@ -48,7 +48,7 @@ interface Pending {
 }
 
 interface IAllowCallbackParams {
-  backend: NDKNip46Backend
+  backend: Nip46Backend
   npub: string
   id: string
   method: string
@@ -692,7 +692,9 @@ export class NoauthBackend {
     return this.keyInfo(dbKey)
   }
 
-  private getDecision(req: DbPending): DECISION {
+  private getDecision(backend: Nip46Backend, req: DbPending): DECISION {
+    if (!(req.method in backend.handlers)) return DECISION.IGNORE
+
     const reqPerm = getReqPerm(req)
     const appPerms = this.perms.filter((p) => p.npub === req.npub && p.appNpub === req.appNpub)
 
@@ -877,7 +879,7 @@ export class NoauthBackend {
           const otherReqs = self.confirmBuffer.filter((r) => r.req.appNpub === req.appNpub)
           console.log('updated perms', this.perms, 'otherReqs', otherReqs, 'connected', connected)
           for (const r of otherReqs) {
-            const dec = this.getDecision(r.req)
+            const dec = this.getDecision(backend, r.req)
             if (dec !== DECISION.ASK) {
               r.cb(dec, false)
             }
@@ -886,7 +888,7 @@ export class NoauthBackend {
       }
 
       // check perms
-      const dec = this.getDecision(req)
+      const dec = this.getDecision(backend, req)
       console.log(Date.now(), 'decision', req.id, dec)
 
       // have perm?
@@ -1173,10 +1175,10 @@ export class NoauthBackend {
   }
 
   private async transferName(npub: string, name: string, newNpub: string) {
-    const key = this.enckeys.find(k => k.npub === npub)
-    if (!key) throw new Error("Npub not found")
-    if (!name) throw new Error("Empty name")
-    if (key.name !== name) throw new Error("Name changed, please reload")
+    const key = this.enckeys.find((k) => k.npub === npub)
+    if (!key) throw new Error('Npub not found')
+    if (!name) throw new Error('Empty name')
+    if (key.name !== name) throw new Error('Name changed, please reload')
     await this.sendTransferNameToServer(npub, key.name, newNpub)
     await dbi.editName(npub, '')
     key.name = ''

src/modules/keys.ts

@@ -43,7 +43,7 @@ export function isWeakPassphase(passphrase: string): boolean {
   const compl = Math.pow(base, passphrase.length)
   const thresh = Math.pow(11, 14)
   // console.log({ big, small, number, punct, base, compl, thresh });
-  return compl < thresh; 
+  return compl < thresh
 }
 
 export class Keys {

src/modules/swic.ts

@@ -20,8 +20,8 @@ export async function swicRegister() {
     },
     onUpdate() {
       // tell new SW that it should activate immediately
-      swr?.waiting?.postMessage({type: 'SKIP_WAITING'})
-    }
+      swr?.waiting?.postMessage({ type: 'SKIP_WAITING' })
+    },
   })
 
   navigator.serviceWorker.ready.then(async (r) => {
@@ -33,8 +33,7 @@ export async function swicRegister() {
       console.log('This page is not currently controlled by a service worker.')
     }
 
-    while (queue.length)
-      await (queue.shift()!)()
+    while (queue.length) await queue.shift()!()
   })
 
   navigator.serviceWorker.addEventListener('message', (event) => {
@@ -43,7 +42,7 @@ export async function swicRegister() {
 }
 
 export function swicWaitStarted() {
-  return new Promise<void>(ok => {
+  return new Promise<void>((ok) => {
     if (swr && swr.active) ok()
     else queue.push(ok)
   })
@@ -78,7 +77,6 @@ export async function swicCall(method: string, ...args: any[]) {
   nextReqId++
 
   return new Promise((ok, rej) => {
-
     const call = async () => {
       if (!swr || !swr.active) {
         rej(new Error('No active service worker'))

src/pages/KeyPage/components/BackgroundSigningWarning.tsx

@@ -16,12 +16,7 @@ export const BackgroundSigningWarning: FC<BackgroundSigningWarningProps> = ({ is
           Enable background service {isEnabling ? <CircularProgress size={'1.5rem'} /> : null}
         </Stack>
       }
-      hint={
-        <Typography variant='body2'>
-          Please allow notifications
-          for background operation. 
-        </Typography>
-      }
+      hint={<Typography variant="body2">Please allow notifications for background operation.</Typography>}
       icon={<AutoModeOutlinedIcon htmlColor="white" />}
       onClick={isEnabling ? undefined : onEnableBackSigning}
     />

src/routes/AppRoutes.tsx

@@ -21,7 +21,6 @@ const AppRoutes = () => {
       <Routes>
         <Route path="/" element={<Layout />}>
           <Route path="/" element={<Navigate to={'/home'} />} />
-          {/* <Route path='/welcome' element={<WelcomePage />} /> */}
           <Route path="/home" element={<HomePage />} />
           <Route path="/key/:npub" element={<KeyPage />} />
           <Route path="/key/:npub/app/:appNpub" element={<AppPage />} />

src/store/index.ts

@@ -2,16 +2,7 @@ import { combineReducers, configureStore } from '@reduxjs/toolkit'
 import { contentSlice } from './reducers/content.slice'
 import { uiSlice } from './reducers/ui.slice'
 
-import {
-  persistStore,
-  persistReducer,
-  // FLUSH,
-  // REGISTER,
-  // REHYDRATE,
-  // PAUSE,
-  // PERSIST,
-  // PURGE,
-} from 'redux-persist'
+import { persistStore, persistReducer } from 'redux-persist'
 import storage from 'redux-persist/lib/storage' // defaults to localStorage for web
 import memoizeOne from 'memoize-one'
 import isDeepEqual from 'lodash.isequal'

src/utils/helpers/date.ts

@@ -3,7 +3,7 @@ import { format } from 'date-fns'
 export const formatTimestampDate = (timestamp: number) => {
   try {
     const date = new Date(timestamp)
-    const formattedDate = format(date, "dd-MM-yyyy HH:mm")
+    const formattedDate = format(date, 'dd-MM-yyyy HH:mm')
     return formattedDate
   } catch (error) {
     return ''