Release v4.10.0

.stylelintrc.js

@@ -3,6 +3,7 @@ module.exports = {
   defaultSeverity: 'warning',
   customSyntax: '@stylelint/postcss-css-in-js',
   rules: {
+    'function-url-quotes': null,
     'no-empty-source': null,
     'function-name-case': null,
     'custom-property-empty-line-before': null,

CHANGELOG.md

@@ -5,6 +5,23 @@ 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).
 
+## [4.10.0] - 2023-10-06
+
+### Added
+
+- Introduced new categories
+- YPP was updated to v2.0: updated landing page, new tiers system; rewards, referrals and dashboard changes
+
+### Changed
+
+- Changed channel tokens withdrawal from membership account to any Joystream account
+
+### Fixed
+
+- Fixed bug with slow loading of a homepage
+- Fixed bug with bid withdrawal from an auction
+- Minor markup fixes
+
 ## [4.9.2] - 2023-09-22
 
 ### Changed

packages/atlas/atlas.config.yml

@@ -51,20 +51,38 @@ features:
     enrollmentUsdReward: 5 # Amount for successful enrollment in YPP in USD.
     referralBaseReward: 2.5 # Self-explanatory, it should match `baseUsdAmount.min` value in last `rewards` entry
     tiersDefinition: # Tiers for YouTube partner program rewards. You can provide maximum three tiers. Each tier should has own multiplier.
-      tiers:
-        - minimumSubscribers: 0
-          multiplier: 1
-        - minimumSubscribers: 1000
-          multiplier: 2
-        - minimumSubscribers: 5000
-          multiplier: 4
-        - minimumSubscribers: 25000
-          multiplier: 6
-        - minimumSubscribers: 50000
-          multiplier: 8
-        - minimumSubscribers: 100000
-          multiplier: 10
-      tiersTooltip: The more subscribers you have on YouTube, the higher the payouts in the program.
+      - tier: 'bronze'
+        reqs:
+          - Lower effort production.
+          - Growing subscriber base of channel supporters.
+        rewards:
+          - 0 # Reward for signup in USD
+          - 0 # Reward for synced video
+          - 0 # Reward for referral
+      - tier: 'silver'
+        reqs:
+          - Original good quality of content.
+          - Sizeable subscriber base with high ratio of views for videos.
+        rewards:
+          - 25
+          - 1
+          - 10
+      - tier: 'gold'
+        reqs:
+          - Great quality of content.
+          - Large subscriber base of fans active in the comments section.
+        rewards:
+          - 50
+          - 3
+          - 25
+      - tier: 'diamond'
+        reqs:
+          - Top tier professional quality.
+          - Recognized influencer and large follower audience.
+        rewards:
+          - 100
+          - 5
+          - 50
     rewards:
       - title: Sign Up to YouTube Partner Program
         showInDashboard: false # Optional. If false the reward will be shown only on YouTube partner program landing page. Default true
@@ -102,7 +120,7 @@ features:
         label: Notion # Used for YPP Dashboard to inform user which vendor given feature uses - if empty defaults to title
         icon: info # Optional icon to be displayed. Possible icons: message, info, tokenStack
       - title: Payments
-        link: /studio/payments
+        link: https://joystream.notion.site/YouTube-Creator-Payouts-02f7cf50972145bfb64c8543914ae4bb
         linkText: Go to Payments
         label: Studio
         icon: tokenStack
@@ -271,110 +289,167 @@ content:
 
   categories: # List of display categories to be used in the app. Those are local to the application and are related to metaprotocol categories via 'videoCategories' array.
     - id: '1' # Local category ID
-      name: 'Science & Technology' # Display name of the category
+      name: 'Art' # Display name of the category
       color: '#D92E61' # Color used in the UI for this category
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/science-and-technology.svg' # URL for category icon SVG
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/science-and-technology.webp' # URL for category cover image
-      videoCategories: ['848-2'] # List of metaprotocol category IDs that should be included in this display category
-      defaultVideoCategory: '848-2'
+      iconUrl: '' # URL for category icon SVG
+      coverImgUrl: '' # URL for category cover image
+      videoCategories: ['3142434-2'] # List of metaprotocol category IDs that should be included in this display category
+      defaultVideoCategory: '3142434-2'
     - id: '2'
-      name: 'Pets & Animals'
+      name: 'Animation and Film'
       color: '#E7BE2D'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/pets-and-animals.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/pets-and-animals.webp'
-      videoCategories: ['893-2']
-      defaultVideoCategory: '893-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142437-2']
+      defaultVideoCategory: '3142437-2'
     - id: '3'
-      name: 'Film & Animation'
+      name: 'Autos and Vehicles'
       color: '#BD4BE4'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/film-and-animation.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/film-and-animation.webp'
-      videoCategories: ['888-2']
-      defaultVideoCategory: '888-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142440-2']
+      defaultVideoCategory: '3142440-2'
     - id: '4'
-      name: 'People & Blogs'
+      name: 'Business and Finance'
       color: '#BDE933'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/people-and-blogs.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/people-and-blogs.webp'
-      videoCategories: ['883-2']
-      defaultVideoCategory: '883-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142443-2']
+      defaultVideoCategory: '3142443-2'
     - id: '5'
-      name: 'Entertainment'
+      name: 'Crypto'
       color: '#54A7F0'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/entertainment.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/entertainment.webp'
-      videoCategories: ['878-2']
-      defaultVideoCategory: '878-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories:
+        [
+          '3142446-2',
+          '57-2',
+          '59-2',
+          '61-2',
+          '63-2',
+          '848-2',
+          '852-2',
+          '856-2',
+          '860-2',
+          '864-2',
+          '868-2',
+          '873-2',
+          '878-2',
+          '883-2',
+          '888-2',
+          '893-2',
+          '898-2',
+          '905-2',
+          '910-2',
+          '915-2',
+        ]
+      defaultVideoCategory: '3142446-2'
     - id: '6'
-      name: 'Education'
+      name: 'DIY'
       color: '#DD379D'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/education.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/education.webp'
-      videoCategories: ['873-2']
-      defaultVideoCategory: '873-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142448-2']
+      defaultVideoCategory: '3142448-2'
     - id: '7'
-      name: 'Travel & Events'
+      name: 'Education'
       color: '#5A7AEE'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/travel-and-events.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/travel-and-events.webp'
-      videoCategories: ['868-2']
-      defaultVideoCategory: '868-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142451-2']
+      defaultVideoCategory: '3142451-2'
     - id: '8'
-      name: 'Sports'
+      name: 'Entertainment'
       color: '#41EE5A'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/sports.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/sports.webp'
-      videoCategories: ['864-2']
-      defaultVideoCategory: '864-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142456-2']
+      defaultVideoCategory: '3142456-2'
     - id: '9'
-      name: 'Gaming'
+      name: 'Lifestyle'
       color: '#9455E8'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/gaming.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/gaming.webp'
-      videoCategories: ['860-2']
-      defaultVideoCategory: '860-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142459-4']
+      defaultVideoCategory: '"3142459-4'
     - id: '10'
-      name: 'Comedy'
+      name: 'Memes and Humour'
       color: '#4FE1F2'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/comedy.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/comedy.webp'
-      videoCategories: ['856-2']
-      defaultVideoCategory: '856-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142468-2']
+      defaultVideoCategory: '3142468-2'
     - id: '11'
-      name: 'Autos & Vehicles'
+      name: 'Music and Music Videos'
       color: '#6E5FEC'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/autos-and-vehicles.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/autos-and-vehicles.webp'
-      videoCategories: ['852-2']
-      defaultVideoCategory: '852-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142471-2']
+      defaultVideoCategory: '3142471-2'
     - id: '12'
-      name: 'Howto & Style'
+      name: 'Nature'
       color: '#E57827'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/howto-and-style.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/howto-and-style.webp'
-      videoCategories: ['898-2']
-      defaultVideoCategory: '898-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142475-2']
+      defaultVideoCategory: '3142475-2'
     - id: '13'
-      name: 'Music'
+      name: 'News and Current Affairs'
       color: '#6EEC3A'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/music.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/music.webp'
-      videoCategories: ['905-2']
-      defaultVideoCategory: '905-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142484-2']
+      defaultVideoCategory: '3142484-2'
     - id: '14'
-      name: 'Nonprofits & Activism'
+      name: 'People and Blogs'
       color: '#E141D6'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/nonprofits-and-activism.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/nonprofit-and-activism.webp'
-      videoCategories: ['910-2']
-      defaultVideoCategory: '910-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142490-2']
+      defaultVideoCategory: '3142490-2'
     - id: '15'
-      name: 'News & Politics'
+      name: 'Pets and Animals'
       color: '#48F0B3'
-      iconUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/icons/news-and-politics.svg'
-      coverImgUrl: 'https://eu-central-1.linodeobjects.com/atlas-assets/categories/atlas/images/news-and-politics.webp'
-      videoCategories: ['915-2']
-      defaultVideoCategory: '915-2'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142493-2']
+      defaultVideoCategory: '3142493-2'
+    - id: '16'
+      name: 'Sports'
+      color: '#B0E839'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142501-3']
+      defaultVideoCategory: '3142501-3'
+    - id: '17'
+      name: 'Technology'
+      color: '#3EE7B4'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142503-2']
+      defaultVideoCategory: '3142503-2'
+    - id: '18'
+      name: 'Travel'
+      color: '#68FA63'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142506-2']
+      defaultVideoCategory: '3142506-2'
+    - id: '19'
+      name: 'Unboxing'
+      color: '#EE4BB7'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142509-2']
+      defaultVideoCategory: '3142509-2'
+    - id: '20'
+      name: 'Video Games'
+      color: '#FCAC4D'
+      iconUrl: ''
+      coverImgUrl: ''
+      videoCategories: ['3142511-2']
+      defaultVideoCategory: '3142511-2'
 
   languages: # List of languages to be used in the app. Those will be used when setting video's language, for adding subtitles, etc.
     - isoCode: ar

packages/atlas/package.json

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

packages/atlas/src/.env

@@ -19,7 +19,7 @@ VITE_HCAPTCHA_SITE_KEY=41cae189-7676-4f6b-aa56-635be26d3ceb
 
 # YPP configuration
 VITE_GOOGLE_CONSOLE_CLIENT_ID=246331758613-rc1psegmsr9l4e33nqu8rre3gno5dsca.apps.googleusercontent.com
-VITE_YOUTUBE_SYNC_API_URL=https://52.204.147.11.nip.io
+VITE_YOUTUBE_SYNC_API_URL=https://50.19.175.219.nip.io
 VITE_YOUTUBE_COLLABORATOR_MEMBER_ID=18
 
 # Analytics tools
@@ -43,7 +43,7 @@ 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_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://52.204.147.11.nip.io/membership
+VITE_DEVELOPMENT_YPP_FAUCET_URL=https://50.19.175.219.nip.io/memberships
 
 # Experimental env URLs
 VITE_NEXT_ORION_AUTH_URL=

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

@@ -17,7 +17,7 @@ import {
   useGetMostViewedVideosConnectionQuery,
   useGetVideosCountQuery,
 } from '@/api/queries/__generated__/videos.generated'
-import { publicVideoFilter } from '@/config/contentFilter'
+import { publicCryptoVideoFilter } from '@/config/contentFilter'
 
 export const useFullVideo = (
   id: string,
@@ -48,7 +48,7 @@ export const useChannelPreviewVideos = (
   const { data, ...rest } = useGetBasicVideosQuery({
     ...opts,
     variables: {
-      where: { ...publicVideoFilter, channel: { id_eq: channelId } },
+      where: { ...publicCryptoVideoFilter, channel: { id_eq: channelId } },
       orderBy: VideoOrderByInput.CreatedAtDesc,
       offset: 0,
       limit: 10,