resolve conflicts

This commit is contained in:
Bekbolsun
2024-01-29 21:21:21 +06:00
11 changed files with 236 additions and 118 deletions

View File

@@ -27,6 +27,7 @@ import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
import { ModalConfirmConnect } from '@/components/Modal/ModalConfirmConnect/ModalConfirmConnect'
import { ModalConfirmEvent } from '@/components/Modal/ModalConfirmEvent/ModalConfirmEvent'
import { DbPending } from '@/modules/db'
import { ACTION_TYPE } from '@/utils/consts'
export type IPendingsByAppNpub = {
[appNpub: string]: {
@@ -68,7 +69,8 @@ const KeyPage = () => {
const filteredPerms = perms.filter((p) => p.npub === npub)
const npubConnectPerms = filteredPerms.filter(
(perm) => perm.perm === 'connect',
(perm) => perm.perm === 'connect'
|| perm.perm === ACTION_TYPE.BASIC,
)
const excludeConnectPendings = filteredPendingReqs.filter(
(pr) => pr.method !== 'connect',
@@ -93,6 +95,14 @@ const KeyPage = () => {
acc[current.appNpub].isConnected = isConnected
return acc
}, {})
// console.log({
// pending,
// filteredPerms,
// npubConnectPerms,
// excludeConnectPendings,
// connectPendings,
// prepareEventPendings
// });
const load = useCallback(async () => {
try {