From 29084a54fa28dc08a0d1fedeb1738d832b2d2acd Mon Sep 17 00:00:00 2001
From: WRadoslaw <r.wyszynski00@gmail.com>
Date: Fri, 17 Nov 2023 09:50:28 +0100
Subject: [PATCH] CR fixes

---
 packages/atlas/src/components/Pill/Pill.styles.ts          | 2 +-
 packages/atlas/src/components/Tabs/Tabs.styles.ts          | 6 ++----
 .../_crt/RevenueShareWidget/RevenueShareWidget.tsx         | 2 +-
 .../views/viewer/PortfolioView/tabs/PortfolioTokenTab.tsx  | 7 +++++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/atlas/src/components/Pill/Pill.styles.ts b/packages/atlas/src/components/Pill/Pill.styles.ts
index 67863fb201..535510fd3e 100644
--- a/packages/atlas/src/components/Pill/Pill.styles.ts
+++ b/packages/atlas/src/components/Pill/Pill.styles.ts
@@ -67,7 +67,7 @@ const variantStyles = ({ variant }: PillProps) => {
 export const StyledPill = styled.div<PillProps & { hasLabel: boolean }>`
   display: inline-flex;
   align-items: center;
-  border-radius: ${(props) => (props.round ? '50%' : '2px')};
+  border-radius: ${(props) => (props.round ? '50%' : cVar('radiusSmall'))};
 
   svg {
     > * {
diff --git a/packages/atlas/src/components/Tabs/Tabs.styles.ts b/packages/atlas/src/components/Tabs/Tabs.styles.ts
index bd6b34d73f..00d65e1cba 100644
--- a/packages/atlas/src/components/Tabs/Tabs.styles.ts
+++ b/packages/atlas/src/components/Tabs/Tabs.styles.ts
@@ -16,8 +16,7 @@ export const TabsGroup = styled.div<{ isBig?: boolean } & MaskProps>`
   display: flex;
   position: relative;
   overflow: auto;
-  padding: ${({ isBig }) => (isBig ? `${sizes(4)} 0` : 'unset')};
-  padding-bottom: 0;
+  padding: ${({ isBig }) => (isBig ? `${sizes(4)} ${sizes(4)} 0` : 'unset')};
 
   ${getMaskImage}
 
@@ -32,8 +31,7 @@ export const TabsGroup = styled.div<{ isBig?: boolean } & MaskProps>`
   }
 
   ${media.md} {
-    padding: ${({ isBig }) => (isBig ? sizes(8) : 'unset')};
-    padding-bottom: 0;
+    padding: ${({ isBig }) => (isBig ? `${sizes(8)} ${sizes(8)} 0` : 'unset')};
   }
 `
 
diff --git a/packages/atlas/src/components/_crt/RevenueShareWidget/RevenueShareWidget.tsx b/packages/atlas/src/components/_crt/RevenueShareWidget/RevenueShareWidget.tsx
index 6ea69c1b95..cdb85fdb65 100644
--- a/packages/atlas/src/components/_crt/RevenueShareWidget/RevenueShareWidget.tsx
+++ b/packages/atlas/src/components/_crt/RevenueShareWidget/RevenueShareWidget.tsx
@@ -29,7 +29,7 @@ export const RevenueShareWidget = ({ tokenName, tokenId, revenueShare, memberId
   const { convertBlockToMsTimestamp, currentBlock } = useBlockTimeEstimation()
   const memberStake = revenueShare.stakers.find((stakers) => stakers.account.member.id === memberId)
   const status =
-    revenueShare.createdIn > currentBlock
+    revenueShare.startingAt > currentBlock
       ? 'upcoming'
       : revenueShare.endsAt < currentBlock && memberStake
       ? 'unlocked'
diff --git a/packages/atlas/src/views/viewer/PortfolioView/tabs/PortfolioTokenTab.tsx b/packages/atlas/src/views/viewer/PortfolioView/tabs/PortfolioTokenTab.tsx
index 2daf60a2fd..45c82486a7 100644
--- a/packages/atlas/src/views/viewer/PortfolioView/tabs/PortfolioTokenTab.tsx
+++ b/packages/atlas/src/views/viewer/PortfolioView/tabs/PortfolioTokenTab.tsx
@@ -20,6 +20,7 @@ import {
 } from '@/components/_crt/CrtPortfolioTable/CrtPortfolioTable'
 import { RevenueShareWidget } from '@/components/_crt/RevenueShareWidget/RevenueShareWidget'
 import { SendFundsDialog } from '@/components/_overlays/SendTransferDialogs'
+import { atlasConfig } from '@/config'
 import { useMediaMatch } from '@/hooks/useMediaMatch'
 import { useSubscribeAccountBalance, useTokenPrice } from '@/providers/joystream'
 import { useJoystreamStore } from '@/providers/joystream/joystream.store'
@@ -171,12 +172,14 @@ export const PortfolioTokenTab = () => {
 
       <FlexBox flow="column" gap={6}>
         <Text variant="h500" as="h3">
-          JOY balance
+          {atlasConfig.joystream.tokenTicker} balance
         </Text>
         <StyledTable
           data={[
             {
-              name: <TokenInfo tokenName="Joystream" tokenTitle="JOY" isVerified={false} />,
+              name: (
+                <TokenInfo tokenName="Joystream" tokenTitle={atlasConfig.joystream.tokenTicker} isVerified={false} />
+              ),
               price: (
                 <Text variant="t100" as="p">
                   ${tokenPrice?.toFixed(6)}