Merge branch 'main' of https://github.com/ethereumfollowprotocol/app

Author: encryptedDegen

src/components/posthog/posthog-identify.tsx

@@ -10,35 +10,50 @@ export default function PostHogIdentify() {
   const lastConnector = useRef<string | undefined>(undefined)
 
   useEffect(() => {
-    if (!posthog.__loaded) return
-
-    if (isConnected && address) {
-      const distinctId = address.toLowerCase()
-      const connectorName = connector?.name
-
-      if (lastAddress.current !== distinctId) {
-        if (lastAddress.current) posthog.reset()
-        posthog.identify(distinctId, {
-          wallet_address: distinctId,
-          wallet_connector: connectorName,
-        })
-        lastAddress.current = distinctId
-        lastConnector.current = connectorName
+    const run = () => {
+      if (isConnected && address) {
+        const distinctId = address.toLowerCase()
+        const connectorName = connector?.name
+        const phId = posthog.get_distinct_id?.()
+        const needsIdentify = lastAddress.current !== distinctId || phId !== distinctId
+
+        if (needsIdentify) {
+          if (lastAddress.current && lastAddress.current !== distinctId) {
+            posthog.reset()
+          }
+          posthog.identify(distinctId, {
+            wallet_address: distinctId,
+            wallet_connector: connectorName,
+          })
+          lastAddress.current = distinctId
+          lastConnector.current = connectorName
+          return
+        }
+
+        if (lastConnector.current !== connectorName) {
+          posthog.setPersonProperties({ wallet_connector: connectorName })
+          lastConnector.current = connectorName
+        }
         return
       }
 
-      if (lastConnector.current !== connectorName) {
-        posthog.setPersonProperties({ wallet_connector: connectorName })
-        lastConnector.current = connectorName
+      if (lastAddress.current) {
+        posthog.reset()
+        lastAddress.current = undefined
+        lastConnector.current = undefined
       }
-      return
     }
 
-    if (lastAddress.current) {
-      posthog.reset()
-      lastAddress.current = undefined
-      lastConnector.current = undefined
+    if (posthog.__loaded) {
+      run()
+      return
     }
+
+    const off = posthog.onFeatureFlags(() => {
+      off?.()
+      run()
+    })
+    return () => off?.()
   }, [address, isConnected, connector?.name])
 
   return null

src/middleware.ts

@@ -7,8 +7,8 @@ export function middleware(request: NextRequest) {
   const nonce = Buffer.from(crypto.randomUUID()).toString('base64')
 
   const cspHeader = `
-    worker-src 'self' *.cloudflareinsights.com cdn.vercel-insights.com vercel.live va.vercel-scripts.com blob:;
-    script-src 'self' *.cloudflareinsights.com cdn.vercel-insights.com vercel.live va.vercel-scripts.com www.googletagmanager.com 'unsafe-inline' 'unsafe-eval';
+    worker-src 'self' *.cloudflareinsights.com cdn.vercel-insights.com vercel.live va.vercel-scripts.com hedge.ethid.org blob:;
+    script-src 'self' *.cloudflareinsights.com cdn.vercel-insights.com vercel.live va.vercel-scripts.com www.googletagmanager.com hedge.ethid.org 'unsafe-inline' 'unsafe-eval';
     media-src 'self';
     connect-src 'self' * *.blockscout.com. wss://efp-events.up.railway.app/;
     object-src 'none';