Merge pull request #6474 from Lezek123/release/5.5.0

Leszek Wiesner · web-flow · commit 66e651517e9f · 2024-12-16T19:06:16.000+01:00
🟣 Release 5.5.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.5.0] - 2024-11-07
+
+**IMPORTANT:** Depends on Orion release `4.1.0`.
+
+### Changed
+
+- Removed _Hot tokens_ section from `CrtMarketplaceView`
+- Updated Orion schema following `4.1.0` release
+- Added minimum volume requirement for `TopCrtMovers`
+- Changed default sorting of _All creator tokens_ from _Price % 30D_ to _Liquidity_
+
 ## [5.4.0] - 2024-07-19
 
 ### Added
diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "description": "UI for consuming Joystream - a user governed video platform",
+  "version": "5.5.0",
   "license": "GPL-3.0",
   "workspaces": [
     "packages/*"
diff --git a/packages/atlas/package.json b/packages/atlas/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@joystream/atlas",
   "description": "UI for consuming Joystream - a user governed video platform",
-  "version": "5.4.0",
+  "version": "5.5.0",
   "license": "GPL-3.0",
   "scripts": {
     "start": "vite",
diff --git a/packages/atlas/src/api/queries/__generated__/baseTypes.generated.ts b/packages/atlas/src/api/queries/__generated__/baseTypes.generated.ts
diff --git a/packages/atlas/src/api/queries/__generated__/creatorTokens.generated.tsx b/packages/atlas/src/api/queries/__generated__/creatorTokens.generated.tsx
diff --git a/packages/atlas/src/api/queries/__generated__/nfts.generated.tsx b/packages/atlas/src/api/queries/__generated__/nfts.generated.tsx
diff --git a/packages/atlas/src/api/queries/__generated__/videos.generated.tsx b/packages/atlas/src/api/queries/__generated__/videos.generated.tsx
diff --git a/packages/atlas/src/api/queries/creatorTokens.graphql b/packages/atlas/src/api/queries/creatorTokens.graphql
@@ -115,8 +115,20 @@ query GetMarketplaceTokens($where: MarketplaceTokenWhereInput, $limit: Int, $off
   }
 }
 
-query GetHotAndColdTokens($where: CreatorTokenWhereInput, $periodDays: Int!, $priceDesc: Boolean, $limit: Int) {
-  tokensWithPriceChange(periodDays: $periodDays, orderByPriceDesc: $priceDesc, limit: $limit, where: $where) {
+query GetHotAndColdTokens(
+  $where: CreatorTokenWhereInput
+  $periodDays: Int!
+  $priceDesc: Boolean
+  $limit: Int
+  $minVolume: BigInt
+) {
+  tokensWithPriceChange(
+    periodDays: $periodDays
+    orderByPriceDesc: $priceDesc
+    limit: $limit
+    minVolume: $minVolume
+    where: $where
+  ) {
     pricePercentageChange
     creatorToken {
       ...BasicCreatorToken
diff --git a/packages/atlas/src/api/schemas/orion.json b/packages/atlas/src/api/schemas/orion.json
diff --git a/packages/atlas/src/components/LastestCrtTrades/LastestCrtTrades.tsx b/packages/atlas/src/components/LastestCrtTrades/LastestCrtTrades.tsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'
 
 import { AmmTransactionOrderByInput } from '@/api/queries/__generated__/baseTypes.generated'
 import { useGetAmmTransactionsQuery } from '@/api/queries/__generated__/creatorTokens.generated'
-import { SvgActionArrowTop } from '@/assets/icons'
+import { SvgActionArrowBottom, SvgActionArrowTop } from '@/assets/icons'
 import { Avatar } from '@/components/Avatar'
 import { FlexBox } from '@/components/FlexBox'
 import { Text } from '@/components/Text'
@@ -32,7 +32,7 @@ export const LastestCrtTrades = () => {
                 ${tx.amm.token.symbol}
               </Text>
               <AmountBox isBuy={tx.transactionType === 'BUY'} alignItems="center">
-                <SvgActionArrowTop />
+                {tx.transactionType === 'BUY' ? <SvgActionArrowTop /> : <SvgActionArrowBottom />}
                 <Text
                   variant="h200"
                   as="h1"
diff --git a/packages/atlas/src/components/TopCrtMovers/TopCrtMovers.tsx b/packages/atlas/src/components/TopCrtMovers/TopCrtMovers.tsx
@@ -13,6 +13,7 @@ import { Text } from '@/components/Text'
 import { SkeletonLoader } from '@/components/_loaders/SkeletonLoader'
 import { absoluteRoutes } from '@/config/routes'
 import { useMediaMatch } from '@/hooks/useMediaMatch'
+import { tokenNumberToHapiBn } from '@/joystream-lib/utils'
 import { sendUserInteraction } from '@/utils/interactions'
 
 import { PercentageChangeIndicator } from '../PercentageChangeIndicator'
@@ -52,13 +53,22 @@ const tableEmptyState = {
   icon: <SvgEmptyStateIllustration />,
 }
 
-export const TopMovingTokens = ({ interval, tableTitle }: { interval: number; tableTitle: string }) => {
+export const TopMovingTokens = ({
+  interval,
+  tableTitle,
+  minVolumeJoy,
+}: {
+  interval: number
+  tableTitle: string
+  minVolumeJoy: number
+}) => {
   const [orderDesc, setOrderDesc] = useState(true)
   const { data, loading } = useGetHotAndColdTokensQuery({
     variables: {
       periodDays: interval,
       priceDesc: orderDesc,
       limit: 10,
+      minVolume: tokenNumberToHapiBn(minVolumeJoy).toString(),
     },
   })
   const columns = getColumns(interval)
diff --git a/packages/atlas/src/components/_crt/MarketplaceCrtTable/MarketplaceCrtTable.tsx b/packages/atlas/src/components/_crt/MarketplaceCrtTable/MarketplaceCrtTable.tsx
@@ -129,14 +129,16 @@ export const MarketplaceCrtTable = ({ data, emptyState, isLoading, ...tableProps
         />
       ),
       status: <CrtStatus status={row.status} />,
-      marketCap: (
+      marketCap: !row.marketCap.isZero() ? (
         <NumberFormat
           icon={<JoyTokenIcon size={16} variant="gray" />}
           format="short"
           withDenomination
           value={row.marketCap}
           as="p"
         />
+      ) : (
+        '–'
       ),
       totalRevenue: (
         <NumberFormat
diff --git a/packages/atlas/src/components/_overlays/MemberDropdown/MemberDropdown.tsx b/packages/atlas/src/components/_overlays/MemberDropdown/MemberDropdown.tsx
@@ -5,6 +5,8 @@ import { useNavigate } from 'react-router'
 import { CSSTransition } from 'react-transition-group'
 import useResizeObserver from 'use-resize-observer'
 
+import { useGetFullCreatorTokenQuery } from '@/api/queries/__generated__/creatorTokens.generated'
+import { StartRevenueShare } from '@/components/_crt/StartRevenueShareModal'
 import { absoluteRoutes } from '@/config/routes'
 import { useAuth } from '@/providers/auth/auth.hooks'
 import { useAuthStore } from '@/providers/auth/auth.store'
@@ -37,9 +39,16 @@ export const MemberDropdown = forwardRef<HTMLDivElement, MemberDropdownProps>(
     } = useAuthStore()
     const [showWithdrawDialog, setShowWithdrawDialog] = useState(false)
     const [disableScrollDuringAnimation, setDisableScrollDuringAnimation] = useState(true)
+    const [openRevenueShareModal, setOpenRevenueShareModal] = useState(false)
 
     const [showSendDialog, setShowSendDialog] = useState(false)
     const selectedChannel = activeMembership?.channels.find((chanel) => chanel.id === channelId)
+    const { data: tokenData } = useGetFullCreatorTokenQuery({
+      variables: {
+        id: activeChannel?.creatorToken?.token.id ?? '',
+      },
+      skip: !activeChannel?.creatorToken?.token.id,
+    })
     const memoizedChannelStateBloatBond = useMemo(() => {
       return new BN(selectedChannel?.channelStateBloatBond || 0)
     }, [selectedChannel?.channelStateBloatBond])
@@ -131,6 +140,13 @@ export const MemberDropdown = forwardRef<HTMLDivElement, MemberDropdownProps>(
           totalBalance={totalBalance}
           channelId={channelId}
         />
+        {tokenData?.creatorTokenById ? (
+          <StartRevenueShare
+            show={openRevenueShareModal}
+            token={tokenData.creatorTokenById}
+            onClose={() => setOpenRevenueShareModal(false)}
+          />
+        ) : null}
         <SendFundsDialog show={showSendDialog} onExitClick={toggleSendDialog} accountBalance={accountBalance} />
 
         <CSSTransition classNames={transitions.names.dropdown} in={isActive} timeout={0} mountOnEnter unmountOnExit>
@@ -161,9 +177,16 @@ export const MemberDropdown = forwardRef<HTMLDivElement, MemberDropdownProps>(
                       channelId={channelId}
                       unseenNotificationsCounts={unseenNotificationsCounts}
                       onSignOut={handleLogout}
-                      onShowFundsDialog={() =>
-                        dropdownType === 'channel' ? setShowWithdrawDialog(true) : setShowSendDialog(true)
-                      }
+                      onShowFundsDialog={() => {
+                        if (dropdownType === 'channel') {
+                          activeChannel?.creatorToken?.token.id
+                            ? setOpenRevenueShareModal(true)
+                            : setShowWithdrawDialog(true)
+                          return
+                        }
+
+                        setShowSendDialog(true)
+                      }}
                       accountBalance={accountBalance}
                       onAddNewChannel={handleAddNewChannel}
                       channelBalance={channelBalance}
diff --git a/packages/atlas/src/config/contentFilter.ts b/packages/atlas/src/config/contentFilter.ts
@@ -33,19 +33,31 @@ export const singlePublicCryptoVideoFilter: VideoWhereInput = {
   },
 }
 
-export const getPublicCryptoVideoFilter = (extraWhere?: VideoWhereInput): VideoWhereInput => ({
-  OR: [
-    {
-      ...singlePublicCryptoVideoFilter,
-      isShort_not_eq: true,
-      isShortDerived_isNull: true,
-      ...(extraWhere ?? {}),
-    },
-    {
-      ...singlePublicCryptoVideoFilter,
-      isShort_isNull: true,
-      isShortDerived_isNull: true,
-      ...(extraWhere ?? {}),
-    },
-  ],
-})
+export const getPublicCryptoVideoFilter = (
+  extraWhere?: VideoWhereInput,
+  enableLanguageFiltering = false
+): VideoWhereInput => {
+  const singlePublicCryptoVideoFilterCopy = {
+    ...singlePublicCryptoVideoFilter,
+  }
+  if (!enableLanguageFiltering) {
+    delete singlePublicCryptoVideoFilterCopy.orionLanguage_in
+  }
+
+  return {
+    OR: [
+      {
+        ...singlePublicCryptoVideoFilterCopy,
+        isShort_not_eq: true,
+        isShortDerived_isNull: true,
+        ...(extraWhere ?? {}),
+      },
+      {
+        ...singlePublicCryptoVideoFilterCopy,
+        isShort_isNull: true,
+        isShortDerived_isNull: true,
+        ...(extraWhere ?? {}),
+      },
+    ],
+  }
+}
diff --git a/packages/atlas/src/hooks/useTokensPagniation.ts b/packages/atlas/src/hooks/useTokensPagniation.ts
@@ -12,7 +12,7 @@ export const useTokensPagination = ({ initialPageSize = 10 }: { initialPageSize?
   // TODO: we should add where clause to url params as well, but currently they are so small that it was omitted
   const pagination = useQueryTableState<MarketplaceTokenOrderByInput>({
     initialPerPage: initialPageSize,
-    initialOrderBy: MarketplaceTokenOrderByInput.PriceChangeDesc,
+    initialOrderBy: MarketplaceTokenOrderByInput.LiquidityDesc,
   })
   const { setOrderBy, orderBy } = pagination
 
diff --git a/packages/atlas/src/views/viewer/CrtMarketplaceView/CrtMarketplaceView.tsx b/packages/atlas/src/views/viewer/CrtMarketplaceView/CrtMarketplaceView.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 
 import { CreatorTokenOrderByInput } from '@/api/queries/__generated__/baseTypes.generated'
-import { HotCreatorTokens } from '@/components/HotCreatorTokens'
 import { LastestCrtTrades } from '@/components/LastestCrtTrades'
 import { LimitedWidthContainer } from '@/components/LimitedWidthContainer'
 import { TopMovingTokens } from '@/components/TopCrtMovers'
@@ -23,13 +22,7 @@ export const CrtMarketplaceView = () => {
 
         <TableFullWitdhtWrapper>
           <LimitedWidthContainer big noBottomPadding>
-            <HotCreatorTokens interval={30} tableTitle="Hot Tokens" />
-          </LimitedWidthContainer>
-        </TableFullWitdhtWrapper>
-
-        <TableFullWitdhtWrapper>
-          <LimitedWidthContainer big noBottomPadding>
-            <TopMovingTokens interval={30} tableTitle="Top Movers" />
+            <TopMovingTokens interval={30} minVolumeJoy={100} tableTitle="Top Movers" />
           </LimitedWidthContainer>
         </TableFullWitdhtWrapper>
 
diff --git a/packages/atlas/src/views/viewer/HomeView.tsx b/packages/atlas/src/views/viewer/HomeView.tsx
@@ -187,12 +187,15 @@ const useHomeVideos = (categories?: string[]) => {
   const { columns, fetchMore, pageInfo, tiles } = useInfiniteVideoGrid({
     query: GetBasicVideosConnectionLightweightDocument,
     variables: {
-      where: getPublicCryptoVideoFilter({
-        id_not_in: avoidIds,
-        category: {
-          id_in: categories,
+      where: getPublicCryptoVideoFilter(
+        {
+          id_not_in: avoidIds,
+          category: {
+            id_in: categories,
+          },
         },
-      }),
+        true
+      ),
       orderBy: VideoOrderByInput.VideoRelevanceDesc,
     },
     options: {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "UI for consuming Joystream - a user governed video platform",`
	`3`	`+ "version": "5.5.0",`
`3`	`4`	`"license": "GPL-3.0",`
`4`	`5`	`"workspaces": [`
`5`	`6`	`"packages/*"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@joystream/atlas",`
`3`	`3`	`"description": "UI for consuming Joystream - a user governed video platform",`
`4`		`- "version": "5.4.0",`
	`4`	`+ "version": "5.5.0",`
`5`	`5`	`"license": "GPL-3.0",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"start": "vite",`