diff --git a/packages/atlas/src/components/ChangeNowModal/ChangeNowModal.tsx b/packages/atlas/src/components/ChangeNowModal/ChangeNowModal.tsx
index 404227afee..e7c731bc1f 100644
--- a/packages/atlas/src/components/ChangeNowModal/ChangeNowModal.tsx
+++ b/packages/atlas/src/components/ChangeNowModal/ChangeNowModal.tsx
@@ -1,6 +1,7 @@
+import styled from '@emotion/styled'
import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'
-import { SvgAlertsInformative32 } from '@/assets/icons'
+import { SvgAlertsInformative32, SvgLogoChangenow } from '@/assets/icons'
import { SwapExpired } from '@/components/ChangeNowModal/steps/SwapExpired'
import { Spinner } from '@/components/_loaders/Spinner'
import { DialogButtonProps } from '@/components/_overlays/Dialog'
@@ -111,7 +112,9 @@ export const ChangeNowModal = ({ type, onClose }: ChangeNowModalProps) => {
onExitClick={step === ChangeNowModalStep.SWAP_EXPIRED ? undefined : () => onClose()}
primaryButton={primaryButtonProps}
secondaryButton={secondaryButton}
- additionalActionsNode={step === ChangeNowModalStep.PROGRESS && primaryButtonProps ? : null}
+ additionalActionsNode={
+ step === ChangeNowModalStep.PROGRESS && !primaryButtonProps ? :
+ }
>
{step === ChangeNowModalStep.INFO && }
{step === ChangeNowModalStep.FORM && (
@@ -127,3 +130,8 @@ export const ChangeNowModal = ({ type, onClose }: ChangeNowModalProps) => {
)
}
+
+const StyledSvgLogoChangenow = styled(SvgLogoChangenow)`
+ height: 30px;
+ width: 60px;
+`
diff --git a/packages/atlas/src/components/_crt/CrtPortfolioTable/CrtPortfolioTable.tsx b/packages/atlas/src/components/_crt/CrtPortfolioTable/CrtPortfolioTable.tsx
index 8eae95ea17..3ae3e39318 100644
--- a/packages/atlas/src/components/_crt/CrtPortfolioTable/CrtPortfolioTable.tsx
+++ b/packages/atlas/src/components/_crt/CrtPortfolioTable/CrtPortfolioTable.tsx
@@ -1,5 +1,5 @@
import styled from '@emotion/styled'
-import { useMemo, useState } from 'react'
+import { ReactElement, useMemo, useState } from 'react'
import { useNavigate } from 'react-router'
import { useBasicChannel } from '@/api/hooks/channel'
@@ -134,28 +134,28 @@ export const CrtPortfolioTable = ({ data, emptyState, isLoading }: CrtPortfolioT
export const TokenInfo = ({
tokenTitle,
- tokenName,
isVerified,
channelId,
-}: Pick) => {
+ customAvatar,
+}: Pick & {
+ customAvatar?: ReactElement
+}) => {
const { channel } = useBasicChannel(channelId ?? '')
const navigate = useNavigate()
return (
- (channelId ? navigate(absoluteRoutes.viewer.channel(channelId, { tab: 'Token' })) : undefined)}
- />
-
+ {customAvatar ?? (
+ (channelId ? navigate(absoluteRoutes.viewer.channel(channelId, { tab: 'Token' })) : undefined)}
+ />
+ )}
+
+
{tokenTitle}
-
-
- {tokenName}
-
- {isVerified && }
-
+ {isVerified && }
)
diff --git a/packages/atlas/src/views/viewer/PortfolioView/tabs/PortfolioTokenTab.tsx b/packages/atlas/src/views/viewer/PortfolioView/tabs/PortfolioTokenTab.tsx
index 822f601cd8..891bc7fef7 100644
--- a/packages/atlas/src/views/viewer/PortfolioView/tabs/PortfolioTokenTab.tsx
+++ b/packages/atlas/src/views/viewer/PortfolioView/tabs/PortfolioTokenTab.tsx
@@ -8,7 +8,7 @@ import {
useGetTokenRevenueSharesCountQuery,
useGetTokenRevenueSharesQuery,
} from '@/api/queries/__generated__/creatorTokens.generated'
-import { SvgActionChevronB } from '@/assets/icons'
+import { SvgActionChevronB, SvgLogoJoystream } from '@/assets/icons'
import { SvgEmptyStateIllustration } from '@/assets/illustrations'
import { FlexBox } from '@/components/FlexBox'
import { NumberFormat } from '@/components/NumberFormat'
@@ -32,6 +32,7 @@ import { useSubscribeAccountBalance, useTokenPrice } from '@/providers/joystream
import { useJoystreamStore } from '@/providers/joystream/joystream.store'
import { useTransactionManagerStore } from '@/providers/transactions/transactions.store'
import { useUser } from '@/providers/user/user.hooks'
+import { cVar, square } from '@/styles'
import { formatNumber } from '@/utils/number'
import { StyledSvgJoyTokenMonochrome24 } from '@/views/studio/MyPaymentsView/PaymentsOverview/PaymentsOverview.styles'
@@ -267,7 +268,16 @@ export const PortfolioTokenTab = () => {
data={[
{
name: (
-
+
+
+
+ }
+ />
),
price: (
@@ -331,3 +341,16 @@ const StyledTable = styled(Table)`
}
}
`
+
+export const JoystreamLogoWrapper = styled.div`
+ ${square(32)};
+
+ display: grid;
+ place-items: center;
+ border-radius: 50%;
+ background-color: ${cVar('colorBackgroundPrimary')};
+
+ svg {
+ ${square(20)};
+ }
+`