v7.7.2

Kwenta · Sep 18, 2023 · 603eb57 · 603eb57 · vercel · Sep 18, 2023
2 parents 9404440 + 8d02c24
commit 603eb57
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 82 deletions.
diff --git a/.github/workflows/jest.yml b/.github/workflows/jest.yml
@@ -37,6 +37,6 @@ jobs:
           NEXT_PUBLIC_WALLETCONNECT_V2_ID: ${{ secrets.NEXT_PUBLIC_WALLETCONNECT_V2_ID }}
 
       - name: Upload coverage to codecov.io
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v3
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/README.md b/README.md
@@ -60,6 +60,7 @@ Required:
 - `NEXT_PUBLIC_SATSUMA_API_KEY` - API key for Satsuma subgraph queries
 - `NEXT_PUBLIC_THEGRAPH_API_KEY` - API key for The Graph's decentralized service
 - `NEXT_PUBLIC_DEFAULT_PRICE_SERVICE` - Specifies the default price server, options are `KWENTA` or `PYTH`
+- `NEXT_PUBLIC_SERVICES_PROXY` - Specify Kwenta proxy server
 
 ### Run
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "kwenta",
-	"version": "7.7.0",
+	"version": "7.7.2",
 	"description": "Kwenta",
 	"main": "index.js",
 	"scripts": {

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@kwenta/app",
-	"version": "7.7.0",
+	"version": "7.7.2",
 	"scripts": {
 		"dev": "next",
 		"build": "next build",

diff --git a/packages/app/src/constants/announcement.ts b/packages/app/src/constants/announcement.ts
@@ -1,13 +1,13 @@
 import { MILLISECONDS_PER_DAY } from '@kwenta/sdk/constants'
 
 // Shows or hides the home page banner entirely when set to true/false
-export const BANNER_ENABLED = false
+export const BANNER_ENABLED = true
 // Sets the link destination for the banner component, or renders the banner as
 // plain, un-clickable text if set to a falsey value (`false`, `null`, '', etc...)
 export const BANNER_LINK_URL =
-	'https://mirror.xyz/kwenta.eth/xFomD0VE0H7o2sQ9zGeLyYPwCmtp8tLMXNTGtWy2UOQ'
+	'https://mirror.xyz/kwenta.eth/qJaLnoRFh8O_UhT3GZB15g8tJDG7KJmKdAEbd905BjM'
 // Sets the text displayed on the home page banner
-export const BANNER_TEXT = 'Important: Staking V2 Migration Coming Soon. Read More  ↗'
+export const BANNER_TEXT = 'Staking V2 Migration on September 21st. Read More  ↗'
 // Sets the height of the banner component on desktop
 export const BANNER_HEIGHT_DESKTOP = 50
 // Sets the height of the banner component on mobile

diff --git a/packages/app/src/sections/dashboard/Stake/RewardsTab.tsx b/packages/app/src/sections/dashboard/Stake/RewardsTab.tsx
@@ -143,6 +143,7 @@ const RewardsTab: FC<TradingRewardProps> = ({ period = 0 }) => {
 						value: formatNumber(estimatedOpRewards, { minDecimals: 4 }),
 					},
 				],
+				disabled: opRewards.eq(0),
 			},
 			{
 				key: 'snx-rewards',
@@ -211,46 +212,48 @@ const RewardsTab: FC<TradingRewardProps> = ({ period = 0 }) => {
 				/>
 			</HeaderContainer>
 			<CardsContainer>
-				{rewardsInfo.map(({ key, title, copy, labels, info }) => (
-					<CardGrid key={key}>
-						<div>
-							<Body size="large" color="primary">
-								{title}
-							</Body>
-							<Body color="secondary">{copy}</Body>
-						</div>
-						<RewardsContainer>
-							<FlexDivRow justifyContent="flex-start" columnGap="15px">
-								{labels.map(({ label, value, labelIcon, valueIcon }) => (
-									<FlexDivCol rowGap="5px">
-										<IconContainer color="secondary">
-											{label}
-											{labelIcon}
-										</IconContainer>
-										<IconContainer size="large" color="preview">
-											{value}
-											{valueIcon}
-										</IconContainer>
-									</FlexDivCol>
-								))}
-							</FlexDivRow>
-							<FlexDivRow justifyContent="flex-start" columnGap="15px">
-								{info.map(({ label, labelIcon, value, valueIcon }) => (
-									<FlexDivCol rowGap="5px">
-										<IconContainer color="secondary">
-											{label}
-											{labelIcon}
-										</IconContainer>
-										<IconContainer size="large" color="primary">
-											{value}
-											{valueIcon}
-										</IconContainer>
-									</FlexDivCol>
-								))}
-							</FlexDivRow>
-						</RewardsContainer>
-					</CardGrid>
-				))}
+				{rewardsInfo
+					.filter((r) => !r.disabled)
+					.map(({ key, title, copy, labels, info }) => (
+						<CardGrid key={key}>
+							<div>
+								<Body size="large" color="primary">
+									{title}
+								</Body>
+								<Body color="secondary">{copy}</Body>
+							</div>
+							<RewardsContainer>
+								<FlexDivRow justifyContent="flex-start" columnGap="15px">
+									{labels.map(({ label, value, labelIcon, valueIcon }) => (
+										<FlexDivCol rowGap="5px">
+											<IconContainer color="secondary">
+												{label}
+												{labelIcon}
+											</IconContainer>
+											<IconContainer size="large" color="preview">
+												{value}
+												{valueIcon}
+											</IconContainer>
+										</FlexDivCol>
+									))}
+								</FlexDivRow>
+								<FlexDivRow justifyContent="flex-start" columnGap="15px">
+									{info.map(({ label, labelIcon, value, valueIcon }) => (
+										<FlexDivCol rowGap="5px">
+											<IconContainer color="secondary">
+												{label}
+												{labelIcon}
+											</IconContainer>
+											<IconContainer size="large" color="primary">
+												{value}
+												{valueIcon}
+											</IconContainer>
+										</FlexDivCol>
+									))}
+								</FlexDivRow>
+							</RewardsContainer>
+						</CardGrid>
+					))}
 				<ButtonContainer>
 					<Button
 						variant="yellow"

diff --git a/packages/app/src/sections/dashboard/Stake/StakingHeading.tsx b/packages/app/src/sections/dashboard/Stake/StakingHeading.tsx
@@ -3,9 +3,8 @@ import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 import Button from 'components/Button'
-import { FlexDivCentered, FlexDivCol, FlexDivRowCentered } from 'components/layout/flex'
-import { Body, Heading } from 'components/Text'
-import { BANNER_TEXT } from 'constants/announcement'
+import { FlexDivCol, FlexDivRowCentered } from 'components/layout/flex'
+import { Heading } from 'components/Text'
 import { EXTERNAL_LINKS } from 'constants/links'
 
 interface StakingHeadingProps {
@@ -17,13 +16,6 @@ export const StakingHeading: FC<StakingHeadingProps> = memo(({ title }) => {
 
 	return (
 		<FlexDivCol>
-			<BannerContainer
-				onClick={() =>
-					window.open(EXTERNAL_LINKS.Docs.StakingV2Migration, '_blank', 'noopener noreferrer')
-				}
-			>
-				<FuturesLink>{BANNER_TEXT}</FuturesLink>
-			</BannerContainer>
 			<TitleContainer>
 				<FlexDivCol rowGap="5px">
 					<StyledHeading variant="h4">{title}</StyledHeading>
@@ -53,20 +45,3 @@ const StyledButton = styled(Button)`
 const StyledHeading = styled(Heading)`
 	font-weight: 400;
 `
-
-const FuturesLink = styled(Body)`
-	color: ${(props) => props.theme.colors.selectedTheme.newTheme.banner.yellow.text};
-	padding: 20px 0px;
-`
-
-const BannerContainer = styled(FlexDivCentered)`
-	width: 100%;
-	justify-content: center;
-	background: ${(props) => props.theme.colors.selectedTheme.newTheme.banner.yellow.background};
-	margin-bottom: 30px;
-	cursor: pointer;
-	border-radius: 8px;
-	white-space: pre-wrap;
-	text-align: center;
-	padding: 0px 5px;
-`
diff --git a/packages/app/src/sections/dashboard/Stake/types.ts b/packages/app/src/sections/dashboard/Stake/types.ts
@@ -33,4 +33,5 @@ export type RewardsInfo = {
 	copy: string
 	labels: RewardsCard[]
 	info: RewardsCard[]
+	disabled?: boolean
 }
diff --git a/packages/app/src/sections/shared/Layout/AppLayout/Header/BalanceActions.tsx b/packages/app/src/sections/shared/Layout/AppLayout/Header/BalanceActions.tsx
@@ -89,6 +89,7 @@ const BalanceActions: FC = () => {
 			rewards: opRewards,
 			onClick: handleClaimOp,
 			isDisabled: claimDisabledOp,
+			rewardsDisabled: opRewards.eq(0),
 		},
 		{
 			key: 'snx-rewards',
@@ -129,7 +130,7 @@ const BalanceActions: FC = () => {
 			{open && (
 				<RewardsTabContainer ref={ref}>
 					<CardsContainer>
-						{REWARDS.map((reward) => (
+						{REWARDS.filter((r) => !r.rewardsDisabled).map((reward) => (
 							<CardGrid key={reward.key}>
 								<Body size="medium" color="primary" weight="bold">
 									{reward.title}

diff --git a/packages/app/src/sections/shared/Layout/HomeLayout/Banner.tsx b/packages/app/src/sections/shared/Layout/HomeLayout/Banner.tsx
@@ -7,11 +7,11 @@ import { Body } from 'components/Text'
 import {
 	BANNER_ENABLED,
 	BANNER_HEIGHT_DESKTOP,
-	BANNER_HEIGHT_MOBILE,
 	BANNER_LINK_URL,
 	BANNER_TEXT,
 	BANNER_WAITING_TIME,
 } from 'constants/announcement'
+import useWindowSize from 'hooks/useWindowSize'
 import { MARKET_SELECTOR_HEIGHT_MOBILE } from 'sections/futures/Trade/MarketsDropdownSelector'
 import CloseIconWithHover from 'sections/shared/components/CloseIconWithHover'
 import { setShowBanner } from 'state/app/reducer'
@@ -29,15 +29,22 @@ type BannerViewProps = {
 const BannerView: React.FC<BannerViewProps> = ({ mode, onDismiss, onDetails }) => {
 	const router = useRouter()
 	const isMobile = mode === 'mobile'
+	const { lessThanWidth } = useWindowSize()
 	const closeIconStyle = isMobile ? { flex: '0.08', marginTop: '5px' } : { flex: '0.1' }
 	const closeIconProps = isMobile ? { width: 12, height: 12 } : {}
 	const linkSize = isMobile ? 'small' : 'medium'
+	const marginTop =
+		router.pathname.includes('market') &&
+		lessThanWidth('md') &&
+		!router.pathname.includes('dashboard')
+			? `${MARKET_SELECTOR_HEIGHT_MOBILE}px`
+			: '0px'
 
 	return (
 		<FuturesBannerContainer
 			onClick={onDetails}
 			$hasDetails={!!BANNER_LINK_URL}
-			$compact={!router.pathname.includes('market')}
+			$marginTop={marginTop}
 		>
 			<FuturesBannerLinkWrapper>
 				<FuturesLink size={linkSize}>
@@ -105,14 +112,15 @@ const FuturesLink = styled(Body)`
 	`};
 `
 
-const FuturesBannerContainer = styled.div<{ $hasDetails?: boolean; $compact?: boolean }>`
+const FuturesBannerContainer = styled.div<{ $hasDetails?: boolean; $marginTop: string }>`
 	height: ${BANNER_HEIGHT_DESKTOP}px;
 	width: 100%;
 	display: flex;
 	align-items: center;
 	background: ${(props) => props.theme.colors.selectedTheme.newTheme.banner.yellow.background};
 	margin-bottom: 15px;
 	cursor: ${(props) => (props.$hasDetails ? 'pointer' : 'auto')};
+	margin-top: ${(props) => props.$marginTop || '0px'};
 
 	${media.lessThan('md')`
 		position: relative;
@@ -124,10 +132,7 @@ const FuturesBannerContainer = styled.div<{ $hasDetails?: boolean; $compact?: bo
 		padding: 12px 10px;
 		border-radius: 0px;
 		gap: 5px;
-		height: ${BANNER_HEIGHT_MOBILE}px;
 	`}
-
-	margin-top: ${(props) => (props.$compact ? 0 : MARKET_SELECTOR_HEIGHT_MOBILE)}px;
 `
 
 const FuturesBannerLinkWrapper = styled.div`

diff --git a/packages/app/src/state/referrals/action.ts b/packages/app/src/state/referrals/action.ts
@@ -17,7 +17,7 @@ import { ThunkConfig } from 'state/types'
 import { selectWallet } from 'state/wallet/selectors'
 import logError from 'utils/logError'
 
-import { setMintedBoostNft, setStartOnboarding } from './reducer'
+import { setMintedBoostNft } from './reducer'
 
 export const mintBoostNft = createAsyncThunk<void, string, ThunkConfig>(
 	'referrals/mintBoostNft',
@@ -44,7 +44,6 @@ export const mintBoostNft = createAsyncThunk<void, string, ThunkConfig>(
 			await monitorAndAwaitTransaction(dispatch, tx)
 			dispatch(fetchBoostNftForAccount())
 			dispatch(setMintedBoostNft(true))
-			dispatch(setStartOnboarding(false))
 		} catch (err) {
 			logError(err)
 			dispatch(handleTransactionError(err.message))