Release v4.6.1

Joystream · Aug 21, 2023 · 8cbef77 · 8cbef77
2 parents 4330b2f + 97f6e86
commit 8cbef77
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ 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.6.1] - 2023-08-21
+
+### Changed
+
+- Changed retries amount for asset upload
+- Changed copy for Google button
+
+### Fixed
+
+- Fixed double segment call for YPP dashboard
+- Fixed more error with crashes when Google Translate is used
+
 ## [4.6.0] - 2023-08-17
 
 ### Added

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

diff --git a/packages/atlas/src/components/Fee/Fee.tsx b/packages/atlas/src/components/Fee/Fee.tsx
@@ -39,7 +39,7 @@ export const Fee: FC<FeeProps> = ({
       {(!hideOnMobile || smMatch) && (
         <>
           <Text as="span" variant={variant} color={color}>
-            Fee:&nbsp;{feeNumber < 0.01 && feeNumber !== 0 && '<'}&nbsp;
+            Fee:&nbsp;{feeNumber < 0.01 && feeNumber !== 0 && <span>{'<'}</span>}&nbsp;
           </Text>
           <NumberFormat
             withToken={withToken}

diff --git a/packages/atlas/src/components/NumberFormat/NumberFormat.tsx b/packages/atlas/src/components/NumberFormat/NumberFormat.tsx
@@ -93,7 +93,7 @@ export const NumberFormat = forwardRef<HTMLHeadingElement, NumberFormatProps>(
             ref={denominationRef}
           >
             ({formattedDenominatedValue !== '<$0.01' ? <span>$</span> : null}
-            {formattedDenominatedValue}){' '}
+            <span>{formattedDenominatedValue}</span>){' '}
           </Text>
         )}
         <StyledText
@@ -115,7 +115,7 @@ export const NumberFormat = forwardRef<HTMLHeadingElement, NumberFormatProps>(
           >
             {' '}
             ({formattedDenominatedValue !== '<$0.01' ? <span>$</span> : null}
-            {formattedDenominatedValue}){' '}
+            <span>{formattedDenominatedValue}</span>){' '}
           </Text>
         )}
       </ContentContainer>
@@ -143,7 +143,7 @@ export const NumberFormat = forwardRef<HTMLHeadingElement, NumberFormatProps>(
                 ref={denominationRef}
               >
                 {formattedDenominatedValue !== '<$0.01' ? <span>$</span> : null}
-                {formattedDenominatedValue}
+                <span>{formattedDenominatedValue}</span>
               </Denomination>
             )}
           </Container>

diff --git a/packages/atlas/src/components/_auth/LogInModal/LogInModal.tsx b/packages/atlas/src/components/_auth/LogInModal/LogInModal.tsx
@@ -108,10 +108,10 @@ export const LogInModal = () => {
         <AuthenticationModalStepTemplate
           title="Sign in"
           subtitle={
-            <>
+            <span>
               Use your {atlasConfig.general.appName} account.{' '}
               <TextButton onClick={() => setAuthModalOpenName('signUp')}>Create account</TextButton>
-            </>
+            </span>
           }
           hasNavigatedBack
         >

diff --git a/packages/atlas/src/components/_buttons/GoogleButton/GoogleButton.tsx b/packages/atlas/src/components/_buttons/GoogleButton/GoogleButton.tsx
@@ -13,7 +13,7 @@ export const GoogleButton = ({ label, ...rest }: GoogleButtonProps) => {
       <IconContainer>
         <SvgGoogleSmallLogo />
       </IconContainer>
-      <span>Sign in with Google</span>
+      <span>Sign up with Google</span>
     </StyledButton>
   )
 }

diff --git a/packages/atlas/src/components/_video/VideoPlayer/VideoPlayer.tsx b/packages/atlas/src/components/_video/VideoPlayer/VideoPlayer.tsx
@@ -189,6 +189,7 @@ const VideoPlayerComponent: ForwardRefRenderFunction<HTMLVideoElement, VideoPlay
       totalLength: video?.duration ?? -1,
       fullScreen: isFullScreen,
       quality: video?.mediaMetadata?.pixelHeight?.toString() ?? '1',
+      isNft: !!video?.nft?.id,
     }),
     [
       videoId,
@@ -197,6 +198,7 @@ const VideoPlayerComponent: ForwardRefRenderFunction<HTMLVideoElement, VideoPlay
       video?.category?.name,
       video?.duration,
       video?.mediaMetadata?.pixelHeight,
+      video?.nft?.id,
       isFullScreen,
     ]
   )

diff --git a/packages/atlas/src/hooks/useSegmentAnalytics.ts b/packages/atlas/src/hooks/useSegmentAnalytics.ts
@@ -11,6 +11,7 @@ export type videoPlaybackParams = {
   totalLength: number
   fullScreen: boolean
   quality: string
+  isNft?: boolean
 }
 
 type PageViewParams = {
@@ -25,6 +26,7 @@ type PageViewParams = {
 type VideoPageViewParams = {
   videoId?: string
   videoTitle?: string
+  isNft?: boolean
   category?: string
 }
 

diff --git a/packages/atlas/src/providers/uploads/uploads.hooks.ts b/packages/atlas/src/providers/uploads/uploads.hooks.ts
@@ -19,7 +19,7 @@ import { InputAssetUpload, StartFileUploadOptions } from './uploads.types'
 
 import { useSnackbar } from '../snackbars'
 
-const MAX_BUCKET_RETRY = 1
+const MAX_BUCKET_RETRY = 3
 const RETRIES_COUNT = 3
 const RETRY_DELAY = 1000
 const UPLOADING_SNACKBAR_TIMEOUT = 8000

diff --git a/packages/atlas/src/views/playground/Playgrounds/PlaygroundGoogleAuthentication.tsx b/packages/atlas/src/views/playground/Playgrounds/PlaygroundGoogleAuthentication.tsx
@@ -31,7 +31,7 @@ export const PlaygroundGoogleAuthentication: FC = () => {
 
   return (
     <>
-      <Button onClick={oauthSignIn}>Sign in with Google</Button>
+      <Button onClick={oauthSignIn}>Sign up with Google</Button>
       {code && (
         <>
           <Text as="h2" variant="h400" margin={{ top: 4 }}>

diff --git a/packages/atlas/src/views/studio/VideoWorkspace/VideoWorkspace.tsx b/packages/atlas/src/views/studio/VideoWorkspace/VideoWorkspace.tsx
@@ -99,7 +99,7 @@ export const VideoWorkspace: FC = memo(() => {
           disabled: formStatus?.isDisabled,
           onClick: () => {
             !isEdit && trackPublishAndUploadClicked(activeChannel?.id)
-            return formStatus?.triggerFormSubmit
+            formStatus?.triggerFormSubmit()
           },
           text: formStatus?.actionBarPrimaryText,
         },

diff --git a/packages/atlas/src/views/studio/YppDashboard/YppDashboard.tsx b/packages/atlas/src/views/studio/YppDashboard/YppDashboard.tsx
@@ -9,6 +9,7 @@ import { atlasConfig } from '@/config'
 import { useHeadTags } from '@/hooks/useHeadTags'
 import { useMediaMatch } from '@/hooks/useMediaMatch'
 import { useSegmentAnalytics } from '@/hooks/useSegmentAnalytics'
+import { useUploadsStore } from '@/providers/uploads/uploads.store'
 import { useGetYppSyncedChannels } from '@/views/global/YppLandingView/useGetYppSyncedChannels'
 import { YppDashboardReferralsTab } from '@/views/studio/YppDashboard/tabs/YppDashboardReferralsTab/YppDashboardReferralsTab'
 
@@ -32,6 +33,7 @@ export const YppDashboard: FC = () => {
   const [currentVideosTab, setCurrentVideosTab] = useState(0)
   const { currentChannel, isLoading } = useGetYppSyncedChannels()
   const { trackPageView } = useSegmentAnalytics()
+  const { processingAssets, uploads } = useUploadsStore()
 
   const subscribersCount = currentChannel?.subscribersCount || 0
   const currentTier = TIERS.reduce((prev, current, idx) => {
@@ -43,8 +45,14 @@ export const YppDashboard: FC = () => {
   }, 0)
 
   useEffect(() => {
+    // if user avatar is currently processing membership will be refetched when it's uploaded,
+    // which will trigger page view event
+    const avatarId = uploads.find((upload) => upload.type === 'avatar')?.id
+    if (avatarId && processingAssets.some((asset) => asset.id === avatarId)) {
+      return
+    }
     trackPageView('YPP Dashboard', { tab: TABS[currentVideosTab] })
-  }, [currentVideosTab, trackPageView])
+  }, [currentVideosTab, processingAssets, trackPageView, uploads])
 
   const tiersTooltip = atlasConfig.features.ypp.tiersDefinition?.tiersTooltip
 

diff --git a/packages/atlas/src/views/viewer/VideoView/VideoView.tsx b/packages/atlas/src/views/viewer/VideoView/VideoView.tsx
@@ -146,10 +146,11 @@ export const VideoView: FC = () => {
       trackPageView('Video', {
         videoId: video.id,
         videoTitle: video.title || undefined,
+        isNft: !!video.nft?.id,
         category: video.category?.name || undefined,
       })
     }
-  }, [trackPageView, video?.category?.name, video?.id, video?.title])
+  }, [trackPageView, video?.category?.name, video?.id, video?.nft?.id, video?.title])
 
   const videoMetaTags = useMemo(() => {
     if (!video || !thumbnailUrls) return {}