Merge branch 'staging' into fixes-10-11

src/layouts/Main.tsx

@@ -39,6 +39,7 @@ export const MainLayout = () => {
   const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState(`Loading App`)
   const isLoggedIn = useAppSelector((state) => state.auth?.loggedIn)
   const authState = useAppSelector((state) => state.auth)
+  const usersAppData = useAppSelector((state) => state.userAppData)
 
   // Ref to track if `subscribeForSigits` has been called
   const hasSubscribed = useRef(false)
@@ -123,6 +124,9 @@ export const MainLayout = () => {
       if (opts.type === 'login' || opts.type === 'signup') {
         dispatch(updateNostrLoginAuthMethod(opts.method))
         login()
+      } else if (opts.type === 'logout') {
+        // Clear `subscribeForSigits` as called after the logout
+        hasSubscribed.current = false
       }
     }
 
@@ -174,12 +178,10 @@ export const MainLayout = () => {
   }, [dispatch])
 
   /**
-   * 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
+   * Subscribe for the sigits
    */
   useEffect(() => {
-    if (authState && isLoggedIn) {
+    if (authState && isLoggedIn && usersAppData) {
       const pubkey = authState.usersPubkey || authState.keyPair?.public
 
       if (pubkey && !hasSubscribed.current) {
@@ -190,6 +192,17 @@ export const MainLayout = () => {
         // Mark `subscribeForSigits` as called
         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) {
         dispatch(setUserRobotImage(getRoboHashPicture(pubkey)))

src/utils/nostr.ts

@@ -875,7 +875,10 @@ export const subscribeForSigits = async (pubkey: string) => {
 }
 
 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