From 2a2371b4917b37f61e29839cd0f5146c5185198f Mon Sep 17 00:00:00 2001 From: Bartosz Dryl Date: Mon, 21 Aug 2023 09:34:34 +0200 Subject: [PATCH 1/6] Fix issue with not being able to create video (#4703) --- .../atlas/src/views/studio/VideoWorkspace/VideoWorkspace.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/atlas/src/views/studio/VideoWorkspace/VideoWorkspace.tsx b/packages/atlas/src/views/studio/VideoWorkspace/VideoWorkspace.tsx index af86c02624..93ec5a6c72 100644 --- 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, }, From 0b224a7851f096405c015d177c09efa6a12a3332 Mon Sep 17 00:00:00 2001 From: Theophile Sandoz Date: Mon, 21 Aug 2023 18:26:00 +0200 Subject: [PATCH 2/6] Switch bucket 3 times before giving asset upload up (#4708) --- packages/atlas/src/providers/uploads/uploads.hooks.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/atlas/src/providers/uploads/uploads.hooks.ts b/packages/atlas/src/providers/uploads/uploads.hooks.ts index 2c05a81217..1aee9f986a 100644 --- 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 From 438fc208ec6160510c6d8e4f703fd0f374533e11 Mon Sep 17 00:00:00 2001 From: WRadoslaw <92513933+WRadoslaw@users.noreply.github.com> Date: Mon, 21 Aug 2023 18:26:54 +0200 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=86=8E=20Google=20translate=20v2=20(#?= =?UTF-8?q?4707)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Login modal * Action bar --- packages/atlas/src/components/Fee/Fee.tsx | 2 +- packages/atlas/src/components/NumberFormat/NumberFormat.tsx | 6 +++--- .../atlas/src/components/_auth/LogInModal/LogInModal.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/atlas/src/components/Fee/Fee.tsx b/packages/atlas/src/components/Fee/Fee.tsx index f18cb92caf..17e59c3d95 100644 --- a/packages/atlas/src/components/Fee/Fee.tsx +++ b/packages/atlas/src/components/Fee/Fee.tsx @@ -39,7 +39,7 @@ export const Fee: FC = ({ {(!hideOnMobile || smMatch) && ( <> - Fee: {feeNumber < 0.01 && feeNumber !== 0 && '<'}  + Fee: {feeNumber < 0.01 && feeNumber !== 0 && {'<'}}  ( ref={denominationRef} > ({formattedDenominatedValue !== '<$0.01' ? $ : null} - {formattedDenominatedValue}){' '} + {formattedDenominatedValue}){' '} )} ( > {' '} ({formattedDenominatedValue !== '<$0.01' ? $ : null} - {formattedDenominatedValue}){' '} + {formattedDenominatedValue}){' '} )} @@ -143,7 +143,7 @@ export const NumberFormat = forwardRef( ref={denominationRef} > {formattedDenominatedValue !== '<$0.01' ? $ : null} - {formattedDenominatedValue} + {formattedDenominatedValue} )} diff --git a/packages/atlas/src/components/_auth/LogInModal/LogInModal.tsx b/packages/atlas/src/components/_auth/LogInModal/LogInModal.tsx index f4be52026a..649a253aec 100644 --- 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 = () => { + Use your {atlasConfig.general.appName} account.{' '} setAuthModalOpenName('signUp')}>Create account - + } hasNavigatedBack > From 9d66518151add199eec937151f428f454561dc25 Mon Sep 17 00:00:00 2001 From: attemka Date: Mon, 21 Aug 2023 18:56:03 +0200 Subject: [PATCH 4/6] Segment followup fixes (#4712) Co-authored-by: Artem --- .../src/components/_video/VideoPlayer/VideoPlayer.tsx | 2 ++ packages/atlas/src/hooks/useSegmentAnalytics.ts | 2 ++ .../src/views/studio/YppDashboard/YppDashboard.tsx | 10 +++++++++- .../atlas/src/views/viewer/VideoView/VideoView.tsx | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/atlas/src/components/_video/VideoPlayer/VideoPlayer.tsx b/packages/atlas/src/components/_video/VideoPlayer/VideoPlayer.tsx index f24b1d27ec..bcdd176c07 100644 --- 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 { 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 index 5e06864d9c..1c410e7b73 100644 --- 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 {} From 6178ebc3d886b48dd86f5ab49c2716ba4edd9022 Mon Sep 17 00:00:00 2001 From: attemka Date: Mon, 21 Aug 2023 18:56:25 +0200 Subject: [PATCH 5/6] Fixed Google button text (#4713) Co-authored-by: Artem --- .../atlas/src/components/_buttons/GoogleButton/GoogleButton.tsx | 2 +- .../playground/Playgrounds/PlaygroundGoogleAuthentication.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/atlas/src/components/_buttons/GoogleButton/GoogleButton.tsx b/packages/atlas/src/components/_buttons/GoogleButton/GoogleButton.tsx index 572b238944..0313a97811 100644 --- 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) => { - Sign in with Google + Sign up with Google ) } diff --git a/packages/atlas/src/views/playground/Playgrounds/PlaygroundGoogleAuthentication.tsx b/packages/atlas/src/views/playground/Playgrounds/PlaygroundGoogleAuthentication.tsx index 263604c543..1bbc0fd562 100644 --- 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 ( <> - + {code && ( <> From 97f6e865b636fc1a53bdb347eeac71cdc98d242b Mon Sep 17 00:00:00 2001 From: Artem Date: Mon, 21 Aug 2023 19:04:03 +0200 Subject: [PATCH 6/6] changelog and version bump --- CHANGELOG.md | 12 ++++++++++++ packages/atlas/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ffc29843b..06906bf797 100644 --- 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 index 8135a07235..01e90559ca 100644 --- 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",