Merge master -> dev

CHANGELOG.md

@@ -5,6 +5,35 @@ 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).
 
+## [3.3.4] - 2023-06-07
+
+### Fixed
+
+- Fixed YPP modal crash on TnC step
+
+## [3.3.3] - 2023-06-06
+
+### Fixed
+
+- Fixed missing notifications
+
+## [3.3.2] - 2023-06-02
+
+### Added
+
+- Added Telugu language
+
+### Changed
+
+- Sentry replays are enabled on YPP page only
+- Atlas TnC were updated
+
+### Fixed
+
+- Fixed issue when Atlas was sending incorrect storage buckets number
+- Fixed bug with multiple context menus for carousel NFT items
+- Fixed recurring updates on user activity page
+
 ## [3.3.1] - 2023-05-25
 
 ### Changed
@@ -20,19 +49,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
- - New NFT marketplace page
- - New homepage with videos feed
+- New NFT marketplace page
+- New homepage with videos feed
 
 ### Changed
 
- - Improved notifications fetch query 
+- Improved notifications fetch query
 
 ### Fixed
 
- - Fixed incorrect comments display
- - Fixed tiles status in studio
- - Fixed bug with modal windows blocking the scroll
- - Minor bugfixes
+- Fixed incorrect comments display
+- Fixed tiles status in studio
+- Fixed bug with modal windows blocking the scroll
+- Minor bugfixes
 
 ## [3.2.0] - 2023-04-21
 

packages/atlas/package.json

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

packages/atlas/src/views/global/YppLandingView/YppAuthorizationModal/YppAuthorizationSteps/YppAuthorizationTermsAndConditionsStep/YppAuthorizationTermsAndConditionsStep.tsx

@@ -1,60 +1,10 @@
 import { FC } from 'react'
 
-import { SvgTierIcon1, SvgTierIcon2, SvgTierIcon3 } from '@/assets/icons'
 import { MarkdownPreview } from '@/components/MarkdownPreview'
-import { Text } from '@/components/Text'
 import { atlasConfig } from '@/config'
 
-import { MultiplierText, TierItem } from './YppAuthorizationTermsAndConditionsStep.styles'
-
 export const YppAuthorizationTermsAndConditionsStep: FC = () => {
   const tnc = atlasConfig.features.ypp.legal.yppTnC
-  const groups = [...tnc.matchAll(/(.+)(## Tiers Multiplier.+)(## Example Rewards Calculation.+)/gs)][0]
-  const [_, beforeTM, __, afterTM] = groups
 
-  return (
-    <div>
-      {beforeTM && <MarkdownPreview markdown={beforeTM} />}
-      <Text variant="t300-strong" as="h3" margin={{ bottom: 2 }}>
-        Tiers Multiplier
-      </Text>
-      <Text variant="t300" as="p" color="colorText">
-        Based on the YouTube channel followers count, a popularity Tier is assigned to each participant. Popularity tier
-        results in multiplication effect on all rewards of the programme.
-      </Text>
-      <TierItem>
-        <SvgTierIcon1 />
-        <Text variant="t300-strong" as="span">
-          Tier 1:
-        </Text>{' '}
-        <Text variant="t300" as="span" color="colorText">
-          {'<'}5K subscribers
-        </Text>
-        <MultiplierText variant="t300" as="span">
-          1x
-        </MultiplierText>
-        <SvgTierIcon2 />
-        <Text variant="t300-strong" as="span">
-          Tier 2:
-        </Text>{' '}
-        <Text variant="t300" as="span" color="colorText">
-          5K-50K subscribers
-        </Text>
-        <MultiplierText variant="t300" as="span">
-          2.5x
-        </MultiplierText>
-        <SvgTierIcon3 />
-        <Text variant="t300-strong" as="span">
-          Tier 3:
-        </Text>{' '}
-        <Text variant="t300" as="span" color="colorText">
-          {'>'}50K subscribers
-        </Text>
-        <MultiplierText variant="t300" as="span">
-          5x
-        </MultiplierText>
-      </TierItem>
-      {afterTM && <MarkdownPreview markdown={afterTM} />}
-    </div>
-  )
+  return <MarkdownPreview markdown={tnc} />
 }