Merge branch 'atlas-master' into gleev/5.6.0

CHANGELOG.md

@@ -5,16 +5,32 @@ 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.6.0] - 2024-12-23
+
+**IMPORTANT:** Depends on Orion release `4.2.0`.
+
+### Added
+
+- Video tipping functionality (https://github.com/Joystream/atlas/issues/6291)
+
+### Fixed
+
+- Improved error handling for optimistic transactions:
+  - Added hadling for `ExtrinsicFailed` errors
+  - Added adequate cleanup of cached optimistic state on error
+- Fixed optimistic actions to be able to handle situations when there are multiple comments in `UNCONFIRMED` state
+- Fixed a bug with invalid condition inside `transactions.manager.tsx` causing `onTxSync` to errously timeout in some cases.
+
 ## [5.5.1] - 2024-11-05
 
 ### Changed
 
 - Re-enabled YPP (`features.ypp.suspended: false`)
-- Added a message in YPP dashboard for creators potentially affected by [opted-out issue](https://github.com/Joystream/youtube-synch/issues/337) 
+- Added a message in YPP dashboard for creators potentially affected by [opted-out issue](https://github.com/Joystream/youtube-synch/issues/337)
 
 ## [5.5.0] - 2024-11-07
 
-**IMPORTANT:** Depends on Orion release `4.1.0`
+**IMPORTANT:** Depends on Orion release `4.1.0`.
 
 ### Changed
 

package.json

@@ -1,6 +1,6 @@
 {
   "description": "UI for consuming Joystream - a user governed video platform",
-  "version": "5.5.1",
+  "version": "5.6.0",
   "license": "GPL-3.0",
   "workspaces": [
     "packages/*"

packages/atlas/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystream/atlas",
   "description": "UI for consuming Joystream - a user governed video platform",
-  "version": "5.5.1",
+  "version": "5.6.0",
   "license": "GPL-3.0",
   "scripts": {
     "start": "vite",

packages/atlas/src/.env

@@ -43,7 +43,7 @@ VITE_PRODUCTION_YPP_FAUCET_URL=https://18.184.136.237.nip.io/membership
 # Development env URLs - this is the default configuration if VITE_ENV != production
 VITE_DEVELOPMENT_ORION_AUTH_URL=https://atlas-dev.joystream.org/api/v1
 VITE_DEVELOPMENT_ORION_URL=https://atlas-dev.joystream.org/orion-api/graphql
-VITE_DEVELOPMENT_QUERY_NODE_SUBSCRIPTION_URL=wss://atlas-dev.joystream.org/orion-v2/graphql
+VITE_DEVELOPMENT_QUERY_NODE_SUBSCRIPTION_URL=wss://atlas-dev.joystream.org/orion-api/graphql
 VITE_DEVELOPMENT_NODE_URL=wss://atlas-dev.joystream.org/ws-rpc
 VITE_DEVELOPMENT_FAUCET_URL=https://atlas-dev.joystream.org/member-faucet/register
 VITE_DEVELOPMENT_YPP_FAUCET_URL=https://50.19.175.219.nip.io/memberships
@@ -59,7 +59,7 @@ VITE_NEXT_YPP_FAUCET_URL=wss://3.73.121.180.nip.io/ws-rpc
 # Local development env URLs
 VITE_LOCAL_ORION_AUTH_URL=http://localhost:4074/api/v1
 VITE_LOCAL_ORION_URL=http://localhost:4350/graphql
-VITE_LOCAL_QUERY_NODE_SUBSCRIPTION_URL=ws://localhost:8081/graphql
+VITE_LOCAL_QUERY_NODE_SUBSCRIPTION_URL=ws://localhost:4350/graphql
 VITE_LOCAL_NODE_URL=ws://localhost:9944/ws-rpc
 VITE_LOCAL_FAUCET_URL=http://localhost:3002/register
 VITE_LOCAL_YPP_FAUCET_URL=https://52.204.147.11.nip.io/membership

packages/atlas/src/api/hooks/comments.ts

@@ -1,4 +1,5 @@
 import { QueryHookOptions } from '@apollo/client'
+import { omit } from 'lodash-es'
 import { useMemo } from 'react'
 
 import {
@@ -13,6 +14,7 @@ import {
   useGetCommentEditsQuery,
   useGetCommentQuery,
   useGetCommentRepliesConnectionQuery,
+  useGetTipTiersQuery,
   useGetUserCommentsAndVideoCommentsConnectionQuery,
   useGetUserCommentsReactionsQuery,
 } from '@/api/queries/__generated__/comments.generated'
@@ -129,3 +131,12 @@ export const useCommentEdits = (
     ...rest,
   }
 }
+
+export const useGetTipTiers = () => {
+  const { data, ...rest } = useGetTipTiersQuery()
+
+  return {
+    tipTiers: data ? omit(data.tipTiers, ['__typename']) : undefined,
+    ...rest,
+  }
+}

packages/atlas/src/api/hooks/useCommentSectionComments.ts

@@ -22,6 +22,7 @@ export const useCommentSectionComments = (
   const unconfirmedComments = data?.videoCommentsConnection.edges
     .map((edge) => edge.node)
     .filter((node) => node.id.includes(UNCONFIRMED))
+    .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
   const unconfirmedCommentLookup = unconfirmedComments && createLookup(unconfirmedComments)
 
   const videoComments = data?.videoCommentsConnection?.edges