Merge pull request #57 from poap-xyz/release/v1.3.5

Release v1.3.5
poap-xyz · May 25, 2023 · b7e2063 · b7e2063
2 parents b6bdd3a + abba810
commit b7e2063
Showing 8 changed files with 65 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@poap-xyz/poap-family",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "author": {
     "name": "POAP",
     "url": "https://poap.xyz"

diff --git a/src/components/InCommon.js b/src/components/InCommon.js
@@ -2,7 +2,7 @@ import toColor from '@mapbox/to-color'
 import { createRef, useContext, useEffect, useState } from 'react'
 import { Link } from 'react-router-dom'
 import { SettingsContext } from '../stores/cache'
-import { filterAndSortInCommonEntries, INCOMMON_EVENTS_LIMIT } from '../models/in-common'
+import { filterAndSortInCommon, INCOMMON_EVENTS_LIMIT } from '../models/in-common'
 import { intersection } from '../utils/array'
 import ButtonLink from './ButtonLink'
 import Card from './Card'
@@ -32,7 +32,7 @@ function InCommon({
   const [ownerHighlighted, setOwnerHighlighted] = useState(null)
   const [liRefs, setLiRefs] = useState({})
 
-  let inCommonEntries = filterAndSortInCommonEntries(Object.entries(inCommon))
+  let inCommonEntries = filterAndSortInCommon(Object.entries(inCommon))
   let inCommonLimit = INCOMMON_EVENTS_LIMIT
 
   if (showCount > 0) {

diff --git a/src/components/LastEvents.js b/src/components/LastEvents.js
@@ -84,26 +84,30 @@ function LastEvents({ currentPage = 1, onPageChange = (page) => {}, qty = 3, sho
           />
         )}
         {loading && <Loading />}
-        {cachedEvents.length > 0 && !loading && <CachedEventList
-          cachedEvents={cachedEvents}
-          showClear={false}
-        />}
+        {cachedEvents.length > 0 && !loading && (
+          <CachedEventList
+            cachedEvents={cachedEvents}
+            showClear={false}
+          />
+        )}
         {error &&
           <ErrorMessage style={{ marginTop: '1rem' }}>
             <span title={error.reason ? `${error.reason}` : undefined}>
               {error.message ?? 'Unknown error'}
             </span>
           </ErrorMessage>
         }
-        {pages > 1 && !loading && <Pagination
-          page={page}
-          pages={pages}
-          total={total}
-          onPage={(newPage) => {
-            setPage(newPage)
-            onPageChange(newPage)
-          }}
-        />}
+        {pages > 1 && !loading && (
+          <Pagination
+            page={page}
+            pages={pages}
+            total={total}
+            onPage={(newPage) => {
+              setPage(newPage)
+              onPageChange(newPage)
+            }}
+          />
+        )}
       </Card>
     </div>
   )

diff --git a/src/models/in-common.js b/src/models/in-common.js
@@ -1,6 +1,6 @@
 import { equals, intersection } from '../utils/array'
 
-function filterAndSortInCommonEntries(inCommonEntries) {
+function filterAndSortInCommon(inCommonEntries) {
   let entries = inCommonEntries.filter(([eventId, addresses]) => addresses.length > 1)
   entries.sort(
     ([aEventId, aAddresses], [bEventId, bAddresses]) => bAddresses.length - aAddresses.length
@@ -30,4 +30,8 @@ function mergeEventsInCommon(eventData, all = false) {
 
 const INCOMMON_EVENTS_LIMIT = 20
 
-export { filterAndSortInCommonEntries, mergeEventsInCommon, INCOMMON_EVENTS_LIMIT }
+export {
+  filterAndSortInCommon,
+  mergeEventsInCommon,
+  INCOMMON_EVENTS_LIMIT,
+}
diff --git a/src/pages/Event.js b/src/pages/Event.js
@@ -8,7 +8,7 @@ import { ReverseEnsContext } from '../stores/ethereum'
 import { scanAddress } from '../loaders/poap'
 import { getInCommonEventsWithProgress, patchEvents, putEventInCommon } from '../loaders/api'
 import { filterCacheEventsByInCommonEventIds, parseEventIds } from '../models/event'
-import { filterAndSortInCommonEntries } from '../models/in-common'
+import { filterAndSortInCommon } from '../models/in-common'
 import Timestamp from '../components/Timestamp'
 import Page from '../components/Page'
 import Card from '../components/Card'
@@ -99,7 +99,7 @@ function Event() {
     () => {
       if (loadedCount === owners.length && !cachedTs) {
         const inCommonProcessed = Object.fromEntries(
-          filterAndSortInCommonEntries(
+          filterAndSortInCommon(
             Object.entries(inCommon)
           )
         )
@@ -319,7 +319,9 @@ function Event() {
                       eta={loadedProgress.estimated}
                       rate={loadedProgress.rate}
                     />
-                  : <Loading />)}
+                  : <Loading />
+                )
+              }
               <AddressErrorList errors={errors} onRetry={retryAddress} />
             </Card>
           :

diff --git a/src/pages/Events.js b/src/pages/Events.js
@@ -5,7 +5,7 @@ import { HTMLContext } from '../stores/html'
 import { ReverseEnsContext } from '../stores/ethereum'
 import { getEventMetrics, getEventsMetrics, getEventsOwners, getInCommonEventsWithProgress, patchEvents, putEventInCommon, putEventOwners } from '../loaders/api'
 import { fetchPOAPs, scanAddress } from '../loaders/poap'
-import { filterAndSortInCommonEntries, mergeEventsInCommon } from '../models/in-common'
+import { filterAndSortInCommon, mergeEventsInCommon } from '../models/in-common'
 import { filterCacheEventsByInCommonEventIds, parseEventIds, parseExpiryDates } from '../models/event'
 import Timestamp from '../components/Timestamp'
 import Card from '../components/Card'
@@ -441,7 +441,7 @@ function Events() {
             eventsLoaded++
             if (eventId in eventData && !eventData[eventId].ts && !(eventId in errors) && !(eventId in loading)) {
               const inCommonProcessed = Object.fromEntries(
-                filterAndSortInCommonEntries(
+                filterAndSortInCommon(
                   Object.entries(eventData[eventId].inCommon)
                 )
               )
@@ -639,7 +639,9 @@ function Events() {
                       </div>
                     </td>
                     <td className="event-cell-owners">
-                      {(status === STATUS_INITIAL || (event.id in loading && loading[event.id] === LOADING_OWNERS)) && !(event.id in owners) && <Loading small={true} />}
+                      {(status === STATUS_INITIAL || (event.id in loading && loading[event.id] === LOADING_OWNERS)) && !(event.id in owners) && (
+                        <Loading small={true} />
+                      )}
                       {event.id in owners && (
                         <ShadowText grow={true} small={true}>
                           {formatStat(owners[event.id].length)}
@@ -669,19 +671,25 @@ function Events() {
                       </div>
                     </td>
                     <td>
-                      {event.id in loadedProgress && <Progress
-                        value={loadedProgress[event.id].progress}
-                        max={1}
-                        showPercent={true}
-                        eta={loadedProgress[event.id].estimated}
-                        rate={loadedProgress[event.id].rate}
-                      />}
-                      {event.id in progress && <Progress
-                        value={loadedCount[event.id]}
-                        max={owners[event.id].length}
-                        showValue={loadedCount[event.id] > 0}
-                      />}
-                      {event.id in loading && loading[event.id] === LOADING_CACHING && <Progress />}
+                      {event.id in loadedProgress && (
+                        <Progress
+                          value={loadedProgress[event.id].progress}
+                          max={1}
+                          showPercent={true}
+                          eta={loadedProgress[event.id].estimated}
+                          rate={loadedProgress[event.id].rate}
+                        />
+                      )}
+                      {event.id in progress && (
+                        <Progress
+                          value={loadedCount[event.id]}
+                          max={owners[event.id].length}
+                          showValue={loadedCount[event.id] > 0}
+                        />
+                      )}
+                      {event.id in loading && loading[event.id] === LOADING_CACHING && (
+                        <Progress />
+                      )}
                       {event.id in eventOwnerErrors && Object.entries(eventOwnerErrors[event.id]).map(
                         ([address, error]) => (
                           <p key={address} className="status-error-message">

diff --git a/src/pages/FeedbackList.js b/src/pages/FeedbackList.js
@@ -129,12 +129,14 @@ function FeedbackList({ qty = 10 }) {
             </ul>
           )}
           {error && <ErrorMessage style={{ marginTop: '1rem' }}>{error.message ?? 'Unknown error'}</ErrorMessage>}
-          {pages > 1 && <Pagination
-            page={page}
-            pages={pages}
-            total={total}
-            onPage={onPageChange}
-          />}
+          {pages > 1 && (
+            <Pagination
+              page={page}
+              pages={pages}
+              total={total}
+              onPage={onPageChange}
+            />
+          )}
         </Card>
       </div>
     </Page>

diff --git a/src/pages/Home.js b/src/pages/Home.js
@@ -48,7 +48,8 @@ function Home() {
                 v{packageJson.version.split('.').slice(0, -1).join('.')}
               </a>
             )
-            : `v${packageJson.version.split('.').slice(0, -1).join('.')}`}
+            : `v${packageJson.version.split('.').slice(0, -1).join('.')}`
+          }
         </span>
       </div>
     </CenterPage>