Merge pull request #408 from poap-xyz/release/v1.17.1

Release v1.17.1
poap-xyz · Nov 25, 2024 · a03ff6b · a03ff6b
2 parents 27a9752 + 8d34546
commit a03ff6b
Show file tree

Hide file tree

Showing 11 changed files with 390 additions and 53 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@poap-xyz/poap-family",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "author": {
     "name": "POAP",
     "url": "https://poap.xyz"

diff --git a/src/components/Loading.tsx b/src/components/Loading.tsx
@@ -10,6 +10,7 @@ function Loading({
   rate,
   count,
   total,
+  totalFinal = true,
   small = false,
   title,
 }: {
@@ -18,6 +19,7 @@ function Loading({
   rate?: number
   count?: number
   total?: number
+  totalFinal?: boolean
   small?: boolean
   title?: ReactNode
 }) {
@@ -47,7 +49,7 @@ function Loading({
             <>
               <div className="count">{count}</div>
               {typeof total === 'number' && (
-                <div className="total">{total}</div>
+                <div className={clsx('total', { final: totalFinal })}>{total}</div>
               )}
             </>
           )}

diff --git a/src/components/Progress.tsx b/src/components/Progress.tsx
@@ -7,13 +7,15 @@ import 'styles/progress.css'
 function Progress({
   value,
   max,
+  maxFinal = true,
   showValue = false,
   showPercent = false,
   eta,
   rate,
 }: {
   value?: number
   max?: number
+  maxFinal?: boolean
   showValue?: boolean
   showPercent?: boolean
   eta?: number
@@ -30,7 +32,11 @@ function Progress({
           value={typeof value === 'number' ? value : undefined}
           max={typeof max === 'number' ? max : undefined}
         />
-        {showValue && <span className="progress-values">{value ?? 0}/{max}</span>}
+        {showValue && (
+          <span className="progress-values">
+            {value ?? 0}/<span className={clsx('max', { final: maxFinal })}>{max}</span>
+          </span>
+        )}
         {showPercent && <span className="progress-percent">
           {hasDetails && (
             <button

diff --git a/src/hooks/useEventInCommon.ts b/src/hooks/useEventInCommon.ts
@@ -17,7 +17,9 @@ function useEventInCommon(
 ): {
   completedEventInCommon: boolean
   loadingEventInCommon: boolean
-  loadedInCommon: CountProgress | null
+  loadedInCommonState: 'eventIds-a' | 'eventIds-z' | 'owners-a' | 'owners-z' | 'events-a' | 'events-z' | null
+  loadedInCommon: CountProgress & { totalFinal: boolean } | null
+  loadedInCommonEvents: CountProgress | null
   loadedInCommonDownload: DownloadProgress | null
   loadedOwners: number
   ownersErrors: Array<{ address: string; error: Error }>
@@ -29,7 +31,9 @@ function useEventInCommon(
 } {
   const [completed, setCompleted] = useState<boolean>(false)
   const [loading, setLoading] = useState<boolean>(false)
-  const [loadedInCommon, setLoadedInCommon] = useState<CountProgress | null>(null)
+  const [loadedInCommonState, setLoadedInCommonState] = useState<'eventIds-a' | 'eventIds-z' | 'owners-a' | 'owners-z' | 'events-a' | 'events-z' | null>(null)
+  const [loadedInCommon, setLoadedInCommon] = useState<CountProgress & { totalFinal: boolean } | null>(null)
+  const [loadedInCommonEvents, setLoadedInCommonEvents] = useState<CountProgress | null>(null)
   const [loadedProgress, setLoadedProgress] = useState<DownloadProgress | null>(null)
   const [loadedOwners, setLoadedOwners] = useState<number>(0)
   const [errors, setErrors] = useState<Array<{ address: string; error: Error }>>([])
@@ -135,6 +139,7 @@ function useEventInCommon(
 
   const fetchEventInCommon = useCallback(
     () => {
+      const controller = new AbortController()
       const controllers: Record<string, AbortController> = owners.reduce(
         (ctrls, owner) => ({ ...ctrls, [owner]: new AbortController() }),
         {}
@@ -149,21 +154,64 @@ function useEventInCommon(
         setLoadedOwners(0)
         setLoadedInCommon(null)
         setLoadedProgress(null)
+        setLoadedInCommonState(null)
         ;(
           stream
             ? getInCommonEventsWithEvents(
                 eventId,
                 /*refresh*/force,
-                /*onProgress*/(received, total) => {
-                  setLoadedInCommon({
-                    count: received,
-                    total,
-                  })
+                /*abortSignal*/controller.signal,
+                /*onProgress*/(
+                  receivedOwners,
+                  receivedEventIds,
+                  totalInCommon,
+                  receivedEvents,
+                  totalEvents
+                ) => {
+                  if (receivedEventIds) {
+                    setLoadedInCommonState(
+                      (prevState) => prevState == null ? 'eventIds-a' : prevState
+                    )
+                    setLoadedInCommon({
+                      count: receivedOwners ?? 0,
+                      total: receivedEventIds,
+                      totalFinal: receivedEventIds === totalInCommon,
+                    })
+                    if (receivedEventIds === totalInCommon) {
+                      setLoadedInCommonState(
+                        (prevState) => prevState === 'eventIds-a' ? 'eventIds-z' : prevState
+                      )
+                    }
+                  }
+                  if (receivedOwners) {
+                    setLoadedInCommonState(
+                      (prevState) => prevState === 'eventIds-z' ? 'owners-a' : prevState
+                    )
+                    if (receivedOwners === receivedEventIds) {
+                      setLoadedInCommonState(
+                        (prevState) => prevState === 'owners-a' ? 'owners-z' : prevState
+                      )
+                    }
+                  }
+                  if (totalEvents) {
+                    setLoadedInCommonState(
+                      (prevState) => prevState === 'owners-z' ? 'events-a' : prevState
+                    )
+                    setLoadedInCommonEvents({
+                      count: receivedEvents ?? 0,
+                      total: totalEvents,
+                    })
+                    if (receivedEvents === totalEvents) {
+                      setLoadedInCommonState(
+                        (prevState) => prevState === 'events-a' ? 'events-z' : prevState
+                      )
+                    }
+                  }
                 },
               )
             : getInCommonEventsWithProgress(
                 eventId,
-                /*abortSignal*/undefined,
+                /*abortSignal*/controller.signal,
                 /*onProgress*/({ progress, estimated, rate }) => {
                   if (progress != null) {
                     setLoadedProgress({
@@ -179,6 +227,7 @@ function useEventInCommon(
               )
         ).then(
           (result) => {
+            setLoadedInCommonState(null)
             setLoadedInCommon(null)
             setLoadedProgress(null)
             if (!result) {
@@ -203,13 +252,15 @@ function useEventInCommon(
         })
       }
       return () => {
+        controller.abort()
         for (const controller of Object.values(controllers)) {
           controller.abort()
         }
         setCompleted(false)
         setLoading(false)
         setLoadedInCommon(null)
         setLoadedProgress(null)
+        setLoadedInCommonState(null)
         setLoadedOwners(0)
         setErrors([])
         setInCommon({})
@@ -232,7 +283,9 @@ function useEventInCommon(
   return {
     completedEventInCommon: completed,
     loadingEventInCommon: loading,
+    loadedInCommonState,
     loadedInCommon,
+    loadedInCommonEvents,
     loadedInCommonDownload: loadedProgress,
     loadedOwners,
     ownersErrors: errors,