diff --git a/__tests__/utils/vaults.test.ts b/__tests__/utils/vaults.test.ts index 21e33a02..f40c7273 100644 --- a/__tests__/utils/vaults.test.ts +++ b/__tests__/utils/vaults.test.ts @@ -30,4 +30,4 @@ describe('getVaultMetaData()', () => { expect(getVaultMetaData(testAddress)?.name).toBe(testVaultName) }) -}) \ No newline at end of file +}) diff --git a/public/images/account.png b/public/images/account.png deleted file mode 100644 index 30d5b51a..00000000 Binary files a/public/images/account.png and /dev/null differ diff --git a/public/images/account.webp b/public/images/account.webp deleted file mode 100644 index 1b3784c3..00000000 Binary files a/public/images/account.webp and /dev/null differ diff --git a/public/images/intro.png b/public/images/intro.png new file mode 100644 index 00000000..f5403019 Binary files /dev/null and b/public/images/intro.png differ diff --git a/public/images/intro.webp b/public/images/intro.webp new file mode 100644 index 00000000..651bcd64 Binary files /dev/null and b/public/images/intro.webp differ diff --git a/src/api/vaults/getDepositedVaults.ts b/src/api/vaults/getDepositedVaults.ts index 2c88b11d..0076ae7b 100644 --- a/src/api/vaults/getDepositedVaults.ts +++ b/src/api/vaults/getDepositedVaults.ts @@ -179,4 +179,4 @@ async function getDepositedVaults(accountId: string): Promise } } -export default getDepositedVaults \ No newline at end of file +export default getDepositedVaults diff --git a/src/components/Account/AccountBalancesTable.tsx b/src/components/Account/AccountBalancesTable.tsx index 75cbed5c..d11ba16c 100644 --- a/src/components/Account/AccountBalancesTable.tsx +++ b/src/components/Account/AccountBalancesTable.tsx @@ -11,13 +11,14 @@ import React from 'react' import { useLocation, useNavigate } from 'react-router-dom' import AccountFund from 'components/Account/AccountFund' -import Button from 'components/Button' +import ActionButton from 'components/Button/ActionButton' import DisplayCurrency from 'components/DisplayCurrency' import { FormattedNumber } from 'components/FormattedNumber' import { SortAsc, SortDesc, SortNone } from 'components/Icons' import Text from 'components/Text' import { ASSETS } from 'constants/assets' import { BN_ZERO } from 'constants/math' +import { ORACLE_DENOM } from 'constants/oracle' import useCurrentAccount from 'hooks/useCurrentAccount' import usePrices from 'hooks/usePrices' import useStore from 'store' @@ -29,8 +30,6 @@ import { BN } from 'utils/helpers' import { convertAprToApy } from 'utils/parsers' import { getPage, getRoute } from 'utils/route' -import { ORACLE_DENOM } from '../../constants/oracle' - interface Props { account: Account lendingData: LendingMarketTableData[] @@ -210,7 +209,7 @@ export default function AccountBalancesTable(props: Props) { if (balanceData.length === 0) return (
-
) -} \ No newline at end of file +} diff --git a/src/components/Modals/FundWithdraw/FundAccount.tsx b/src/components/Modals/FundWithdraw/FundAccount.tsx index 13284e80..ef5ab596 100644 --- a/src/components/Modals/FundWithdraw/FundAccount.tsx +++ b/src/components/Modals/FundWithdraw/FundAccount.tsx @@ -184,4 +184,4 @@ export default function FundAccount(props: Props) { /> ) -} \ No newline at end of file +} diff --git a/src/components/Modals/Settings/index.tsx b/src/components/Modals/Settings/index.tsx index 71852f91..76a2647c 100644 --- a/src/components/Modals/Settings/index.tsx +++ b/src/components/Modals/Settings/index.tsx @@ -108,7 +108,7 @@ export default function SettingsModal() { setAutoLendOnAllAccounts(value) setLendAssets(value) }, - [setLendAssets], + [setLendAssets, setAutoLendOnAllAccounts], ) const handleTutorial = useCallback( diff --git a/src/components/Portfolio/PortfolioIntro.tsx b/src/components/Portfolio/PortfolioIntro.tsx new file mode 100644 index 00000000..2d1db2f5 --- /dev/null +++ b/src/components/Portfolio/PortfolioIntro.tsx @@ -0,0 +1,14 @@ +import Intro from 'components/Intro' + +export default function PortfolioIntro() { + return ( + + This is your Portfolio. Use it to get an overview + about all your Credit Accounts and their balances. + + } + > + ) +} diff --git a/src/components/RewardsCenter.tsx b/src/components/RewardsCenter.tsx index 1bd90efe..af2e3422 100644 --- a/src/components/RewardsCenter.tsx +++ b/src/components/RewardsCenter.tsx @@ -20,8 +20,7 @@ import { BNCoin } from 'types/classes/BNCoin' import { byDenom } from 'utils/array' import { defaultFee } from 'utils/constants' import { formatAmountWithSymbol, getCoinValue } from 'utils/formatters' - -import { ORACLE_DENOM } from '../constants/oracle' +import { ORACLE_DENOM } from 'constants/oracle' const renderIncentives = (unclaimedRewards: BNCoin[]) => { if (unclaimedRewards.length === 0) diff --git a/src/components/Switch/SwitchAutoLend.tsx b/src/components/Switch/SwitchAutoLend.tsx index 3df96141..c4362f6f 100644 --- a/src/components/Switch/SwitchAutoLend.tsx +++ b/src/components/Switch/SwitchAutoLend.tsx @@ -32,4 +32,4 @@ export default function SwitchAutoLend(props: Props) { /> ) -} \ No newline at end of file +} diff --git a/src/components/Switch/SwitchWithLabel.tsx b/src/components/Switch/SwitchWithLabel.tsx index e501306d..7ecc216b 100644 --- a/src/components/Switch/SwitchWithLabel.tsx +++ b/src/components/Switch/SwitchWithLabel.tsx @@ -40,4 +40,4 @@ export default function SwitchWithLabel(props: Props) { /> ) -} \ No newline at end of file +} diff --git a/src/components/Tooltip/TooltipContent.tsx b/src/components/Tooltip/TooltipContent.tsx index f6cbb521..6b49b256 100644 --- a/src/components/Tooltip/TooltipContent.tsx +++ b/src/components/Tooltip/TooltipContent.tsx @@ -16,19 +16,13 @@ export default function TooltipContent(props: Props) {
- {typeof props.content === 'string' ? ( - - {props.content} - - ) : ( - props.content - )} + {typeof props.content === 'string' ? {props.content} : props.content}
{
diff --git a/src/constants/assets.ts b/src/constants/assets.ts index 7c35e36a..d344109c 100644 --- a/src/constants/assets.ts +++ b/src/constants/assets.ts @@ -155,4 +155,4 @@ export const ASSETS: Asset[] = [ hasOraclePrice: true, forceFetchPrice: true, }, -] \ No newline at end of file +] diff --git a/src/pages/BorrowPage.tsx b/src/pages/BorrowPage.tsx index d5642b34..47ba44ff 100644 --- a/src/pages/BorrowPage.tsx +++ b/src/pages/BorrowPage.tsx @@ -1,3 +1,4 @@ +import BorrowIntro from 'components/Borrow/BorrowIntro' import BorrowTable from 'components/Borrow/BorrowTable' import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData' @@ -6,6 +7,7 @@ export default function BorrowPage() { return ( <> + diff --git a/src/pages/FarmPage.tsx b/src/pages/FarmPage.tsx index 93c24bae..2734c628 100644 --- a/src/pages/FarmPage.tsx +++ b/src/pages/FarmPage.tsx @@ -1,11 +1,12 @@ +import FarmIntro from 'components/Earn/Farm/FarmIntro' import { AvailableVaults, DepositedVaults } from 'components/Earn/Farm/Vaults' import Tab from 'components/Earn/Tab' export default function FarmPage() { return ( -
+
- {/* */} +
diff --git a/src/pages/LendPage.tsx b/src/pages/LendPage.tsx index 556bdb89..6315374d 100644 --- a/src/pages/LendPage.tsx +++ b/src/pages/LendPage.tsx @@ -1,13 +1,14 @@ +import LendIntro from 'components/Earn/Lend/LendIntro' import LendingMarketsTable from 'components/Earn/Lend/LendingMarketsTable' import Tab from 'components/Earn/Tab' import useLendingMarketAssetsTableData from 'hooks/useLendingMarketAssetsTableData' export default function LendPage() { const { accountLentAssets, availableAssets } = useLendingMarketAssetsTableData() - return ( -
+
+
diff --git a/src/pages/PortfolioPage.tsx b/src/pages/PortfolioPage.tsx index 765e5a04..b3cfa28d 100644 --- a/src/pages/PortfolioPage.tsx +++ b/src/pages/PortfolioPage.tsx @@ -1,5 +1,11 @@ import AccountOverview from 'components/Account/AccountOverview' +import PortfolioIntro from 'components/Portfolio/PortfolioIntro' export default function PortfolioPage() { - return + return ( + <> + + + + ) } diff --git a/src/store/slices/broadcast.ts b/src/store/slices/broadcast.ts index 68b98d78..53cf4ca5 100644 --- a/src/store/slices/broadcast.ts +++ b/src/store/slices/broadcast.ts @@ -20,7 +20,6 @@ import { formatAmountWithSymbol } from 'utils/formatters' import getTokenOutFromSwapResponse from 'utils/getTokenOutFromSwapResponse' import { BN } from 'utils/helpers' - function generateExecutionMessage( sender: string | undefined = '', contract: string, @@ -527,4 +526,4 @@ export default function createBroadcastSlice( } }, } -} \ No newline at end of file +} diff --git a/src/types/enums/docURL.ts b/src/types/enums/docURL.ts index 100bd431..ec44596e 100644 --- a/src/types/enums/docURL.ts +++ b/src/types/enums/docURL.ts @@ -3,6 +3,7 @@ export enum DocURL { BORROW_LENDING_URL = 'https://docs.marsprotocol.io', COOKIE_POLICY_URL = 'https://docs.marsprotocol.io/mars-protocol/terms-of-service/mars-cookie-policy', CONCENTRATED_LIQUIDITY_URL = 'https://docs.marsprotocol.io', + DOCS_URL = 'https://docs.marsprotocol.io/', MANAGE_ACCOUNT_URL = 'https://docs.marsprotocol.io/docs/learn/workstation/rover/managing-credit-accounts', ROVER_INTRO_URL = 'https://docs.marsprotocol.io/docs/learn/workstation/rover/rover-intro', PRIVACY_POLICY_URL = 'https://docs.marsprotocol.io/mars-protocol/terms-of-service/mars-privacy-policy', diff --git a/src/types/interfaces/store/broadcast.d.ts b/src/types/interfaces/store/broadcast.d.ts index 305a9462..d0902325 100644 --- a/src/types/interfaces/store/broadcast.d.ts +++ b/src/types/interfaces/store/broadcast.d.ts @@ -52,4 +52,4 @@ interface BroadcastSlice { borrow: BNCoin[] reclaims: ActionCoin[] }) => Promise -} \ No newline at end of file +} diff --git a/src/utils/tokens.ts b/src/utils/tokens.ts index 7bcf59f5..7ae0869f 100644 --- a/src/utils/tokens.ts +++ b/src/utils/tokens.ts @@ -19,4 +19,4 @@ export const getTokenInfo = (denom: string, marketAssets: Asset[]) => export function getTokenPrice(denom: string, prices: BNCoin[]): BigNumber { const price = prices.find((price) => price.denom === denom)?.amount || '0' return BN(price) -} \ No newline at end of file +} diff --git a/src/utils/vaults.ts b/src/utils/vaults.ts index b92cd805..a9431510 100644 --- a/src/utils/vaults.ts +++ b/src/utils/vaults.ts @@ -177,4 +177,4 @@ function getSwapAction(denomIn: string, denomOut: string, amount: BigNumber, sli slippage: slippage.toString(), }, } -} \ No newline at end of file +} diff --git a/tailwind.config.js b/tailwind.config.js index 38c413ac..9e2822be 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -47,7 +47,7 @@ module.exports = { sticky: '50px', }, backgroundImage: { - account: 'url(/images/account.webp), url(/images/account.png)', + intro: 'url(/images/intro.webp), url(/images/intro.png)', }, backgroundSize: { desktop: '100% auto', @@ -136,6 +136,7 @@ module.exports = { height: { 4.5: '18px', 15: '60px', + 55: '220px', }, hueRotate: { '-82': '-82deg', @@ -217,6 +218,7 @@ module.exports = { 92.5: '370px', 100: '400px', 120: '480px', + 140: '560px', }, zIndex: { 1: '1',