Remove pyth rewards completely (on 1st January)

src/assets/images/banner/10.json

@@ -1,12 +1,4 @@
 [
-    {
-        "image": "december-rewards.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
-    {
-        "image": "chained-rewards-10k.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
     {
         "image": "banner-zerofees.png",
         "url": ""

src/assets/images/banner/11155420.json

@@ -1,12 +1,4 @@
 [
-    {
-        "image": "december-rewards.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
-    {
-        "image": "chained-rewards-10k.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
     {
         "image": "banner-zerofees.png",
         "url": ""

src/assets/images/banner/137.json

@@ -1,12 +1,4 @@
 [
-    {
-        "image": "december-rewards.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
-    {
-        "image": "chained-rewards-10k.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
     {
         "image": "banner-zerofees.png",
         "url": ""

src/assets/images/banner/42161.json

@@ -1,12 +1,4 @@
 [
-    {
-        "image": "december-rewards.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
-    {
-        "image": "chained-rewards-10k.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
     {
         "image": "banner-zerofees.png",
         "url": ""

src/assets/images/banner/8453.json

@@ -1,12 +1,4 @@
 [
-    {
-        "image": "december-rewards.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
-    {
-        "image": "chained-rewards-10k.png",
-        "url": "https://dune.com/leifu/thales-speed-markets-competition-24"
-    },
     {
         "image": "banner-zerofees.png",
         "url": ""

src/components/Banner/Banner.tsx

@@ -4,7 +4,7 @@ import { Trans } from 'react-i18next';
 import 'react-responsive-carousel/lib/styles/carousel.min.css';
 import styled from 'styled-components';
 
-const IS_VISIBLE = true;
+const IS_VISIBLE = false;
 
 const Banner: React.FC = () => {
     const [showBanner, setShowBanner] = useState(IS_VISIBLE);

src/i18n/en.json

@@ -89,8 +89,7 @@
         },
         "header": {
             "get-started": "Get started",
-            "notification": { "tooltip": "You have {{count}} claimable position(s)" },
-            "submit-solana": "Submit Solana address"
+            "notification": { "tooltip": "You have {{count}} claimable position(s)" }
         },
         "footer": {
             "github": "GitHub",
@@ -360,18 +359,8 @@
         "copying-address": "Copying Address",
         "docs": "Docs and Tutorials",
         "withdraw": "Withdraw",
-        "pyth": "Pyth Rewards",
         "trading-profile": "Trading Profile",
         "logout": "Logout",
         "session-valid": "Session valid until"
-    },
-    "pyth-rewards": {
-        "title": "PYTH rewards",
-        "rewards-info": "Input your Solana address to receive the airdrop. Address input will be open until December 31st after which the rewards will be distributed.",
-        "input-label": "Input/change your solana address:",
-        "invalid-solana-address": "Invalid Solana address",
-        "submit": "Submit",
-        "success": "Successfully submitted solana address",
-        "total-received": "Total received:"
     }
 }

src/layouts/DappLayout/DappHeader/DappHeader.tsx

@@ -1,34 +1,30 @@
 import Button from 'components/Button';
 import ConnectWalletModal from 'components/ConnectWalletModal';
 import NetworkSwitch from 'components/NetworkSwitch';
+import ROUTES from 'constants/routes';
 import { ScreenSizeBreakpoint } from 'enums/ui';
 import GetStarted from 'pages/AARelatedPages/GetStarted';
 import Withdraw from 'pages/AARelatedPages/Withdraw';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import useExchangeRatesQuery, { Rates } from 'queries/rates/useExchangeRatesQuery';
+import useMultipleCollateralBalanceQuery from 'queries/walletBalances/useMultipleCollateralBalanceQuery';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
+import { getIsAppReady } from 'redux/modules/app';
 import { getIsMobile } from 'redux/modules/ui';
 import { getIsBiconomy, getWalletConnectModalVisibility, setWalletConnectModalVisibility } from 'redux/modules/wallet';
 import styled from 'styled-components';
-import { Colors, FlexDivRow, FlexDivRowCentered, PAGE_MAX_WIDTH } from 'styles/common';
+import { FlexDivRow, FlexDivRowCentered, PAGE_MAX_WIDTH } from 'styles/common';
+import { Coins } from 'thales-utils';
 import { RootState } from 'types/ui';
+import biconomyConnector from 'utils/biconomyWallet';
+import { getCollaterals, isStableCurrency } from 'utils/currency';
+import { navigateTo } from 'utils/routes';
 import { useAccount, useChainId, useClient } from 'wagmi';
 import Logo from '../components/Logo';
 import Notifications from '../components/Notifications';
 import UserInfo from '../components/UserInfo';
 import UserWallet from '../components/UserWallet';
-import useMultipleCollateralBalanceQuery from 'queries/walletBalances/useMultipleCollateralBalanceQuery';
-import useExchangeRatesQuery, { Rates } from 'queries/rates/useExchangeRatesQuery';
-import { getIsAppReady } from 'redux/modules/app';
-import biconomyConnector from 'utils/biconomyWallet';
-import { getCollaterals, isStableCurrency } from 'utils/currency';
-import { Coins, localStore } from 'thales-utils';
-import { navigateTo } from 'utils/routes';
-import ROUTES from 'constants/routes';
-import PythModal from '../components/PythModal';
-import { LOCAL_STORAGE_KEYS } from 'constants/storage';
-import useSolanaAddressForWalletQuery from 'queries/solana/useSolanaAddressForWalletQuery';
-import { isValidSolanaAddress } from 'utils/solana';
 
 const DappHeader: React.FC = () => {
     const { t } = useTranslation();
@@ -47,8 +43,6 @@ const DappHeader: React.FC = () => {
     const [openGetStarted, setOpenGetStarted] = useState(false);
     const [openUserInfo, setOpenUserInfo] = useState(false);
     const [openWithdraw, setOpenWithdraw] = useState(false);
-    const [openPythModal, setPythModalOpen] = useState(false);
-    const [hideSolanaButton, setHideSolanaButton] = useState(true);
 
     const burgerMenuRef = useRef<HTMLElement>(null);
 
@@ -92,29 +86,6 @@ const DappHeader: React.FC = () => {
         }
     }, [exchangeRates, multipleCollateralBalances.data, networkId, getUSDForCollateral]);
 
-    useEffect(() => {
-        if (isConnected) {
-            const showPyth = localStore.get(LOCAL_STORAGE_KEYS.SHOW_PYTH_MODAL);
-            if (!showPyth) {
-                localStore.set(LOCAL_STORAGE_KEYS.SHOW_PYTH_MODAL, 'true');
-                setPythModalOpen(true);
-            }
-        }
-    }, [isConnected]);
-
-    const solanaAddressQuery = useSolanaAddressForWalletQuery(
-        (isBiconomy ? biconomyConnector.address : walletAddress) as string,
-        {
-            enabled: isConnected,
-        }
-    );
-
-    useEffect(() => {
-        if (solanaAddressQuery.isSuccess) {
-            setHideSolanaButton(isValidSolanaAddress(solanaAddressQuery.data));
-        }
-    }, [solanaAddressQuery, solanaAddressQuery.isSuccess, solanaAddressQuery.data]);
-
     return (
         <Container>
             <LeftContainer>
@@ -133,19 +104,6 @@ const DappHeader: React.FC = () => {
                             {t(totalBalanceValue > 0 ? 'deposit.title' : 'common.header.get-started')}
                         </Button>
                     )}
-                    {!isMobile && isConnected && !hideSolanaButton && (
-                        <Button
-                            width="240px"
-                            height="30px"
-                            margin="10px"
-                            fontSize="12px"
-                            borderColor={Colors.RED}
-                            pulsate
-                            onClick={() => setPythModalOpen(true)}
-                        >
-                            {t('common.header.submit-solana')}
-                        </Button>
-                    )}
                 </FlexDivRow>
             </LeftContainer>
             <RightContainer>
@@ -198,14 +156,12 @@ const DappHeader: React.FC = () => {
                     <UserInfo
                         setUserInfoOpen={setOpenUserInfo}
                         setOpenWithdraw={setOpenWithdraw}
-                        setPythModalOpen={setPythModalOpen}
                         skipOutsideClickOnElement={burgerMenuRef}
                     />
                 )}
             </RightContainer>
             {openGetStarted && <GetStarted onClose={() => setOpenGetStarted(false)} />}
             {openWithdraw && <Withdraw onClose={() => setOpenWithdraw(false)} />}
-            {openPythModal && <PythModal onClose={() => setPythModalOpen(false)} />}
 
             <ConnectWalletModal
                 isOpen={connectWalletModalVisibility}