src/components/Modal/ModalLogin/ModalLogin.tsx

@@ -147,7 +147,7 @@ export const ModalLogin = () => {
 
         <Stack gap={'0.5rem'}>
           <Button type="submit" fullWidth disabled={isLoading}>
-            Login {isLoading && <LoadingSpinner />}
+            Add account {isLoading && <LoadingSpinner />}
           </Button>
         </Stack>
       </Stack>

src/hooks/useProfile.ts

@@ -14,7 +14,7 @@ export const useProfile = (npub: string) => {
   const [profile, setProfile] = useState<MetaEvent | null>(null)
   const currentKey = useAppSelector((state) => selectKeyByNpub(state, npub))
 
-  const userName = currentKey?.name || getProfileUsername(profile)
+  const userName = getProfileUsername(profile) || currentKey?.name
   const userAvatar = profile?.info?.picture || ''
   const avatarTitle = getFirstLetter(userName)
 

src/modules/backend.ts

@@ -10,7 +10,7 @@ import NDK, {
   NDKSubscriptionCacheUsage,
   NDKUser,
 } from '@nostr-dev-kit/ndk'
-import { NOAUTHD_URL, WEB_PUSH_PUBKEY, NIP46_RELAYS, MIN_POW, MAX_POW, KIND_RPC, DOMAIN, REQ_TTL } from '../utils/consts'
+import { NOAUTHD_URL, WEB_PUSH_PUBKEY, NIP46_RELAYS, MIN_POW, MAX_POW, KIND_RPC, DOMAIN } from '../utils/consts'
 // import { Nip04 } from './nip04'
 import { fetchNip05, getReqPerm, getShortenNpub, isPackagePerm } from '@/utils/helpers/helpers'
 import { NostrPowEvent, minePow } from './pow'
@@ -310,13 +310,6 @@ export class NoauthBackend {
     this.apps = await dbi.listApps()
     console.log('started apps', this.apps)
 
-    // drop old pending reqs
-    const pending = await dbi.listPending()
-    for (const p of pending) {
-      if (p.timestamp < Date.now() - REQ_TTL)
-        await dbi.removePending(p.id)
-    }
-
     const sub = await this.swg.registration.pushManager.getSubscription()
 
     for (const k of this.enckeys) {

src/pages/KeyPage/hooks/useTriggerConfirmModal.ts

@@ -1,7 +1,7 @@
 import { useModalSearchParams } from '@/hooks/useModalSearchParams'
 import { DbPending, DbPerm } from '@/modules/db'
 import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { ACTION_TYPE, REQ_TTL } from '@/utils/consts'
+import { ACTION_TYPE } from '@/utils/consts'
 import { useCallback, useEffect, useRef } from 'react'
 import { useSearchParams } from 'react-router-dom'
 
@@ -25,7 +25,7 @@ export const useTriggerConfirmModal = (npub: string, pending: DbPending[], perms
   const isConfirmConnectModalOpened = getModalOpened(MODAL_PARAMS_KEYS.CONFIRM_CONNECT)
   const isConfirmEventModalOpened = getModalOpened(MODAL_PARAMS_KEYS.CONFIRM_EVENT)
 
-  const filteredPendingReqs = pending.filter((p) => p.npub === npub && p.timestamp > Date.now() - REQ_TTL)
+  const filteredPendingReqs = pending.filter((p) => p.npub === npub)
   const filteredPerms = perms.filter((p) => p.npub === npub)
 
   const npubConnectPerms = filteredPerms.filter((perm) => perm.perm === 'connect' || perm.perm === ACTION_TYPE.BASIC)

src/utils/consts.ts

@@ -11,8 +11,6 @@ export const KIND_RPC = 24133
 
 export const RELOAD_STORAGE_KEY = 'reload'
 
-export const REQ_TTL = 60000 // 1 min
-
 export enum ACTION_TYPE {
   BASIC = 'basic',
   ADVANCED = 'advanced',

src/utils/helpers/helpers.ts

@@ -16,7 +16,7 @@ export const getShortenNpub = (npub = '') => {
 }
 
 export const getProfileUsername = (profile: MetaEvent | null) => {
-  if (!profile) return undefined
+  if (!profile) return null
   return profile?.info?.name || profile?.info?.display_name
 }
 
@@ -72,7 +72,6 @@ export function isPackagePerm(perm: string, reqPerm: string) {
       case 'sign_event:10002':
       case 'sign_event:30023':
       case 'sign_event:10000':
-      case 'sign_event:27235':
         return true
     }
   }