Merge pull request #138 from dappforce/fix-shuffle-creators

Fix shuffle of creators list
dappforce · Jan 19, 2024 · 2510121 · 2510121
2 parents 9a1c9b9 + 02e9726
commit 2510121
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/components/creatorsStaking/Creators/index.tsx b/src/components/creatorsStaking/Creators/index.tsx
@@ -31,20 +31,23 @@ type AllCreatorsProps = {
   spaceIds?: string[]
   era?: string
   sortBy: string
+  isMyCreators: boolean
 }
 
 const CreatorsCards = ({
   spaceIds,
   era,
   sortBy,
+  isMyCreators,
   ...modalProps
 }: AllCreatorsProps) => {
   // const [ page, setPage ] = useState(1)
-  const sortedSpaceIds = useSortBy(sortBy, spaceIds, era)
+  const sortedSpaceIds = useSortBy(sortBy, spaceIds, era, isMyCreators)
 
+
   const ids =
-    sortedSpaceIds && !isEmptyArray(sortedSpaceIds) ? sortedSpaceIds : spaceIds
-
+  sortedSpaceIds && !isEmptyArray(sortedSpaceIds) ? sortedSpaceIds : spaceIds
+  
   if (!ids || isEmptyArray(ids))
     return (
       <div className='h-[261px] flex items-center justify-center'>
@@ -119,14 +122,14 @@ const CreatorsSectionInner = ({
       id: 'all-creators',
       text: 'All Creators',
       content: () => (
-        <CreatorsCards spaceIds={spaceIds} era={era} sortBy={sortBy} />
+        <CreatorsCards isMyCreators={false} spaceIds={spaceIds} era={era} sortBy={sortBy} />
       ),
     },
     {
       id: 'my-creators',
       text: `My Creators (${isMulti ? 0 : myCreatorsIds.length || 0})`,
       content: () => (
-        <CreatorsCards spaceIds={myCreatorsIds} era={era} sortBy={sortBy} />
+        <CreatorsCards isMyCreators={true} spaceIds={myCreatorsIds} era={era} sortBy={sortBy} />
       ),
       disabled: myCreatorsIds.length === 0 || isMulti,
     },

diff --git a/src/components/creatorsStaking/hooks/useSortCreators.tsx b/src/components/creatorsStaking/hooks/useSortCreators.tsx
@@ -22,7 +22,8 @@ const sortValues = <T extends BackerInfoRecord | EraStakesBySpaceIdsRecord>(
 export const useSortBy = (
   sortBy: string,
   spaceIds?: string[],
-  era?: string
+  era?: string,
+  isMyCreators?: boolean
 ) => {
   const myAddress = useMyAddress()
   const backersInfo = useBackerInfoBySpaces(spaceIds, myAddress)
@@ -39,11 +40,12 @@ export const useSortBy = (
     } else if (sortBy === 'my-stake') {
       return sortValues(backersInfo, 'totalStaked')
     } else {
-      const isNewSpaceIdsArr = !isEmptyArray(
+      const isNewSpaceIdsArr = isMyCreators ? !isEmptyArray(
         spaceIds?.filter((spaceId) => shuffledSpaceIds?.includes(spaceId)) || []
-      )
-
+      ) : true
+      
       if (!shuffledSpaceIds?.length && isNewSpaceIdsArr) {
+
         setShuffledSpaceIds(shuffle(spaceIds))
       }
 
@@ -57,5 +59,6 @@ export const useSortBy = (
     myAddress,
   ])
 
+
   return sortedSpaceIds
 }
diff --git a/src/components/interesting-accounts/InterestingAccounts.tsx b/src/components/interesting-accounts/InterestingAccounts.tsx
@@ -36,7 +36,7 @@ export const PreviewAccountsGrid: FC = () => {
   return (
     <div>
       <Row justify='space-between'>
-        <Col className={clsx({['w-100']: isMobile})}>
+        <Col className={clsx({ ['w-100']: isMobile })}>
           <SectionTitle
             title={t('interestingAccounts.title')}
           />

diff --git a/src/components/txHistory/transactions/Transfer.tsx b/src/components/txHistory/transactions/Transfer.tsx
@@ -226,7 +226,6 @@ const MobileTransfer = ({
   const [ open, setOpen ] = useState(false)
   const titleByKind = txKind === 'TRANSFER_TO' ? 'Received from' : 'Sent to'
 
-  console.log(extrinsicHash)
   return (
     <>
       <div className={styles.TransferRow} onClick={() => setOpen(true)}>