Release v4.13.3

WRadoslaw · Dec 8, 2023 · 5a4011c · 5a4011c
2 parents f764fad + 10e4759
commit 5a4011c
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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.14.3] - 2023-12-08
+
+### Changed
+
+- Changed Atlas TnC
+
+### Fixed
+
+- Fixed mismatch for notification types [2]
+
 ## [4.14.2] - 2023-12-06
 
 ### Fixed

diff --git a/packages/atlas/atlas.config.yml b/packages/atlas/atlas.config.yml
@@ -149,7 +149,7 @@ features:
 
         ## Who is the program for
 
-        The program is targeted at YouTube creators that already have a channel focussed on Crypto and Web3 content, with substantial published videos and subscribers. The program involves compensation in JOY tokens for YouTube creators who choose to opt in, meet the qualification criteria and perform actions that are linked to rewards.
+        The program is targeted at YouTube creators with substantial published videos and subscribers. The program involves compensation in JOY tokens for YouTube creators who choose to opt in, meet the qualification criteria and perform actions that are linked to rewards.
 
         ## YPP Rewards and Key Information
 
@@ -571,7 +571,7 @@ legal:
   termsOfService: |
     # Terms of Service
 
-    Last updated on the 9th of June 2023
+    Last updated on the 4th of December 2023
 
     This Terms of Service ("Agreement") is a binding obligation between you ("User") and Jsgenesis AS ("Company", "We", "Us", "Our") for use of our Joystream Player interface ("$VITE_APP_NAME") hosted at play.joystream.org and all other products (collectively "Software") developed and published by Us.
 

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": "4.14.2",
+  "version": "4.14.3",
   "license": "GPL-3.0",
   "scripts": {
     "start": "vite",

diff --git a/packages/atlas/src/components/NotificationsTable/NotificationsTable.tsx b/packages/atlas/src/components/NotificationsTable/NotificationsTable.tsx
@@ -8,8 +8,13 @@ import { Table } from './NotificationsTable.styles'
 
 export type NotificationsState = Record<string, { inAppEnabled: boolean; emailEnabled: boolean }>
 
+export type NotificationSettingSections<Name extends string = string> = {
+  title: string
+  rows: { label: string; name: Name }[]
+}[]
+
 type NotificationsTableComponentProps = {
-  sections: { title: string; rows: { label: string; name: string }[] }[]
+  sections: NotificationSettingSections
   form: UseFormReturn<NotificationsState>
   disabled?: boolean
 }

diff --git a/...o/MyChannelView/tabs/StudioChannelNotificationsTab/StudioChannelNotificationsTab.utils.ts b/...o/MyChannelView/tabs/StudioChannelNotificationsTab/StudioChannelNotificationsTab.utils.ts
@@ -1,4 +1,9 @@
-export const TABLE_STRUCTURE = [
+import { SetChannelNotificationPreferencesMutation } from '@/api/queries/__generated__/notifications.generated'
+import { NotificationSettingSections } from '@/components/NotificationsTable'
+
+type Name = Exclude<keyof SetChannelNotificationPreferencesMutation['setAccountNotificationPreferences'], '__typename'>
+
+export const TABLE_STRUCTURE: NotificationSettingSections<Name> = [
   {
     title: 'Content moderation and featuring',
     rows: [

diff --git a/...ws/viewer/MembershipSettingsView/MembershipNotifications/MembershipNotifications.utils.ts b/...ws/viewer/MembershipSettingsView/MembershipNotifications/MembershipNotifications.utils.ts
@@ -1,4 +1,12 @@
-export const TABLE_STRUCTURE = [
+import { SetMembershipNotificationPreferencesMutation } from '@/api/queries/__generated__/notifications.generated'
+import { NotificationSettingSections } from '@/components/NotificationsTable'
+
+type Name = Exclude<
+  keyof SetMembershipNotificationPreferencesMutation['setAccountNotificationPreferences'],
+  '__typename'
+>
+
+export const TABLE_STRUCTURE: NotificationSettingSections<Name> = [
   {
     title: 'Generic',
     rows: [
@@ -45,10 +53,6 @@ export const TABLE_STRUCTURE = [
         label: 'Someone placed higher bid than you',
         name: 'higherBidThanYoursMade',
       },
-      {
-        label: 'Auction you participated in expired',
-        name: 'timedAuctionExpired',
-      },
       {
         label: 'You won the auction',
         name: 'auctionWon',