🟣 Release 4.14.6

Merge pull request #5759 from WRadoslaw/release/4.14.6

CHANGELOG.md

@@ -5,6 +5,17 @@ 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.6] - 2024-01-12
+
+### Fixed
+
+- Fixed user geolocation on viewer side
+- Fixed embedded view on mobile devices
+
+### Changed
+
+- Changed YPP opt out error message to include API message, for better UX.
+
 ## [4.14.5] - 2023-12-29
 
 ### Fixed

packages/atlas-meta-server/src/tags.ts

@@ -39,7 +39,7 @@ export const generateCommonMetaTags = (
     }),
     ...(image && {
       'og:image': image,
-      'twitter:image': appUrl + image,
+      'twitter:image': image,
       'og:image:alt': title,
       'twitter:image:alt': title,
       'og:image:type': 'image/webp',

packages/atlas/package.json

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

packages/atlas/src/embedded/App.tsx

@@ -11,6 +11,7 @@ import { OperatorsContextProvider } from '@/providers/assets/assets.provider'
 import { handleAnonymousAuth } from '@/providers/auth/auth.helpers'
 import { useAuthStore } from '@/providers/auth/auth.store'
 import { ConfirmationModalProvider } from '@/providers/confirmationModal'
+import { OverlayManagerProvider } from '@/providers/overlayManager'
 import { SegmentAnalyticsProvider } from '@/providers/segmentAnalytics/segment.provider'
 import { GlobalStyles } from '@/styles'
 import { EmbeddedView } from '@/views/viewer/EmbeddedView'
@@ -57,9 +58,11 @@ export const EmbeddedCommonProviders: FC<PropsWithChildren> = ({ children }) =>
           <QueryClientProvider client={queryClient}>
             <AnonymousEmbeddedProvider>
               <ConfirmationModalProvider>
-                <BrowserRouter>
-                  <OperatorsContextProvider>{children}</OperatorsContextProvider>
-                </BrowserRouter>
+                <OverlayManagerProvider>
+                  <BrowserRouter>
+                    <OperatorsContextProvider>{children}</OperatorsContextProvider>
+                  </BrowserRouter>
+                </OverlayManagerProvider>
               </ConfirmationModalProvider>
             </AnonymousEmbeddedProvider>
           </QueryClientProvider>

packages/atlas/src/providers/assets/assets.provider.tsx

@@ -160,6 +160,10 @@ export const OperatorsContextProvider: FC<PropsWithChildren> = ({ children }) =>
     fetchStorageOperators()
   }, [fetchStorageOperators, isStudio])
 
+  useMountEffect(() => {
+    getUserCoordinates()
+  })
+
   useMountEffect(() => {
     const initBenchmark = async () => {
       const thumbnail = benchmarkData?.videos

packages/atlas/src/providers/wallet/wallet.helpers.ts

@@ -17,6 +17,9 @@ export const getWalletsList = () => {
   return [...supportedWallets, ...unknownWallets]
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const filterUnsupportedAccounts = (account: any) => account.type === 'sr25519'
+
 export class UnknownWallet extends BaseDotsamaWallet {
   extensionName: string
   title: string

packages/atlas/src/providers/wallet/wallet.provider.tsx

@@ -10,7 +10,7 @@ import { formatJoystreamAddress } from '@/utils/address'
 import { SentryLogger } from '@/utils/logs'
 import { retryWalletPromise } from '@/utils/misc'
 
-import { getWalletsList } from './wallet.helpers'
+import { filterUnsupportedAccounts, getWalletsList } from './wallet.helpers'
 
 const WalletContext = createContext<undefined | WalletContextValue>(undefined)
 WalletContext.displayName = 'WalletContext'
@@ -29,8 +29,7 @@ export const WalletProvider: FC<PropsWithChildren> = ({ children }) => {
 
   const setWalletAccounts = useCallback(
     async (accounts: WalletAccount[]) => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const polkadotAccounts = accounts.filter((account: any) => account.type === 'sr25519')
+      const polkadotAccounts = accounts.filter(filterUnsupportedAccounts)
 
       const mappedAccounts = polkadotAccounts.map((account) => {
         return {
@@ -59,12 +58,14 @@ export const WalletProvider: FC<PropsWithChildren> = ({ children }) => {
         // taken from https://github.com/TalismanSociety/talisman-connect/blob/47cfefee9f1333326c0605c159d6ee8ebfba3e84/libs/wallets/src/lib/base-dotsama-wallet/index.ts#L98-L107
         // should be part of future talisman-connect release
         const accounts = await selectedWallet.extension.accounts.get()
+
         const accountsWithWallet = accounts
+          .filter(filterUnsupportedAccounts)
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           .map((account: any) => {
             return {
               ...account,
-              address: account.address,
+              address: formatJoystreamAddress(account.address),
               source: selectedWallet.extension?.name as string,
               wallet: selectedWallet,
               signer: selectedWallet.extension?.signer,

packages/atlas/src/views/studio/YppDashboard/tabs/YppDashboardSettingsTab.tsx

@@ -1,3 +1,4 @@
+import { isAxiosError } from 'axios'
 import { useCallback, useEffect, useState } from 'react'
 import { useMutation } from 'react-query'
 import { useNavigate } from 'react-router'
@@ -228,8 +229,17 @@ export const YppDashboardSettingsTab = () => {
         })
         return
       }
-
       SentryLogger.error('Error while opting out: ', e)
+
+      if (isAxiosError(e)) {
+        displaySnackbar({
+          title: 'Something went wrong',
+          description: e.response?.data?.message ?? 'Failed to leave the program. Try again later',
+          iconType: 'error',
+        })
+        return
+      }
+
       displaySnackbar({
         title: 'Something went wrong',
         description: 'Failed to leave the program. Try again later',