fix: processing events

Partially revert to before 23a04faad8
This commit is contained in:
enes 2024-10-12 11:52:43 +02:00
parent 7f5fd4534f
commit 25764c7ab4
2 changed files with 18 additions and 5 deletions

View File

@ -39,6 +39,7 @@ export const MainLayout = () => {
const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState(`Loading App`) const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState(`Loading App`)
const isLoggedIn = useAppSelector((state) => state.auth?.loggedIn) const isLoggedIn = useAppSelector((state) => state.auth?.loggedIn)
const authState = useAppSelector((state) => state.auth) const authState = useAppSelector((state) => state.auth)
const usersAppData = useAppSelector((state) => state.userAppData)
// Ref to track if `subscribeForSigits` has been called // Ref to track if `subscribeForSigits` has been called
const hasSubscribed = useRef(false) const hasSubscribed = useRef(false)
@ -174,12 +175,10 @@ export const MainLayout = () => {
}, [dispatch]) }, [dispatch])
/** /**
* When authState change user logged in / or app reloaded * Subscribe for the sigits
* we set robohash avatar in the global state based on user npub
* so that avatar will be consistent across the app when kind 0 is empty
*/ */
useEffect(() => { useEffect(() => {
if (authState && isLoggedIn) { if (authState && isLoggedIn && usersAppData) {
const pubkey = authState.usersPubkey || authState.keyPair?.public const pubkey = authState.usersPubkey || authState.keyPair?.public
if (pubkey && !hasSubscribed.current) { if (pubkey && !hasSubscribed.current) {
@ -190,6 +189,17 @@ export const MainLayout = () => {
// Mark `subscribeForSigits` as called // Mark `subscribeForSigits` as called
hasSubscribed.current = true hasSubscribed.current = true
} }
}
}, [authState, isLoggedIn, usersAppData])
/**
* When authState change user logged in / or app reloaded
* we set robohash avatar in the global state based on user npub
* so that avatar will be consistent across the app when kind 0 is empty
*/
useEffect(() => {
if (authState && isLoggedIn) {
const pubkey = authState.usersPubkey || authState.keyPair?.public
if (pubkey) { if (pubkey) {
dispatch(setUserRobotImage(getRoboHashPicture(pubkey))) dispatch(setUserRobotImage(getRoboHashPicture(pubkey)))

View File

@ -875,7 +875,10 @@ export const subscribeForSigits = async (pubkey: string) => {
} }
const processReceivedEvent = async (event: Event, difficulty: number = 5) => { const processReceivedEvent = async (event: Event, difficulty: number = 5) => {
const processedEvents = store.getState().userAppData?.processedGiftWraps || [] const processedEvents = store.getState().userAppData?.processedGiftWraps
// Abort processing if userAppData is undefined
if (!processedEvents) return
if (processedEvents.includes(event.id)) return if (processedEvents.includes(event.id)) return