diff --git a/public/images/bg-intro.png b/public/images/bg-intro.png new file mode 100644 index 00000000..8248ff4e Binary files /dev/null and b/public/images/bg-intro.png differ diff --git a/public/images/bg-intro.webp b/public/images/bg-intro.webp new file mode 100644 index 00000000..a2cd150e Binary files /dev/null and b/public/images/bg-intro.webp differ diff --git a/public/images/intro/bg1.png b/public/images/intro/bg1.png deleted file mode 100644 index d4bedfb2..00000000 Binary files a/public/images/intro/bg1.png and /dev/null differ diff --git a/public/images/intro/bg1.webp b/public/images/intro/bg1.webp deleted file mode 100644 index 3f933edd..00000000 Binary files a/public/images/intro/bg1.webp and /dev/null differ diff --git a/public/images/intro/bg2.png b/public/images/intro/bg2.png deleted file mode 100644 index c4801e74..00000000 Binary files a/public/images/intro/bg2.png and /dev/null differ diff --git a/public/images/intro/bg2.webp b/public/images/intro/bg2.webp deleted file mode 100644 index b82418b0..00000000 Binary files a/public/images/intro/bg2.webp and /dev/null differ diff --git a/public/images/intro/bg3.png b/public/images/intro/bg3.png deleted file mode 100644 index 50e70766..00000000 Binary files a/public/images/intro/bg3.png and /dev/null differ diff --git a/public/images/intro/bg3.webp b/public/images/intro/bg3.webp deleted file mode 100644 index 82b2aa21..00000000 Binary files a/public/images/intro/bg3.webp and /dev/null differ diff --git a/public/images/intro/bg4.png b/public/images/intro/bg4.png deleted file mode 100644 index 3a063a9b..00000000 Binary files a/public/images/intro/bg4.png and /dev/null differ diff --git a/public/images/intro/bg4.webp b/public/images/intro/bg4.webp deleted file mode 100644 index 8379d292..00000000 Binary files a/public/images/intro/bg4.webp and /dev/null differ diff --git a/public/images/intro/bg5.png b/public/images/intro/bg5.png deleted file mode 100644 index 433dd388..00000000 Binary files a/public/images/intro/bg5.png and /dev/null differ diff --git a/public/images/intro/bg5.webp b/public/images/intro/bg5.webp deleted file mode 100644 index 4582ba57..00000000 Binary files a/public/images/intro/bg5.webp and /dev/null differ diff --git a/public/images/intro/bg6.png b/public/images/intro/bg6.png deleted file mode 100644 index 9ed38321..00000000 Binary files a/public/images/intro/bg6.png and /dev/null differ diff --git a/public/images/intro/bg6.webp b/public/images/intro/bg6.webp deleted file mode 100644 index c9e9c9fb..00000000 Binary files a/public/images/intro/bg6.webp and /dev/null differ diff --git a/public/images/intro/bg7.png b/public/images/intro/bg7.png deleted file mode 100644 index ce73380b..00000000 Binary files a/public/images/intro/bg7.png and /dev/null differ diff --git a/public/images/intro/bg7.webp b/public/images/intro/bg7.webp deleted file mode 100644 index 4d95fd13..00000000 Binary files a/public/images/intro/bg7.webp and /dev/null differ diff --git a/public/images/intro/bg8.png b/public/images/intro/bg8.png deleted file mode 100644 index a11e0ac1..00000000 Binary files a/public/images/intro/bg8.png and /dev/null differ diff --git a/public/images/intro/bg8.webp b/public/images/intro/bg8.webp deleted file mode 100644 index 111853ca..00000000 Binary files a/public/images/intro/bg8.webp and /dev/null differ diff --git a/src/components/Account/AccountDetails/index.tsx b/src/components/Account/AccountDetails/index.tsx index 68a88c7a..15cb1b05 100644 --- a/src/components/Account/AccountDetails/index.tsx +++ b/src/components/Account/AccountDetails/index.tsx @@ -9,7 +9,7 @@ import Card from 'components/Card' import DisplayCurrency from 'components/DisplayCurrency' import { FormattedNumber } from 'components/FormattedNumber' import { HealthGauge } from 'components/HealthGauge' -import { Cross, ThreeDots } from 'components/Icons' +import { ThreeDots } from 'components/Icons' import Text from 'components/Text' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { REDUCE_MOTION_KEY } from 'constants/localStore' @@ -140,7 +140,7 @@ function AccountDetails(props: Props) { 'group-hover:opacity-100', )} > - {accountDetailsExpanded ? : } + {!accountDetailsExpanded && } {glowElement(!reduceMotion)} diff --git a/src/components/DocsLink.tsx b/src/components/DocsLink.tsx index 46e20b62..cbd7ec77 100644 --- a/src/components/DocsLink.tsx +++ b/src/components/DocsLink.tsx @@ -23,11 +23,11 @@ export default function DocsLink(props: Props) { {linkText} - + ) diff --git a/src/components/Earn/Tab.tsx b/src/components/Earn/Tab.tsx index 261bae05..349829be 100644 --- a/src/components/Earn/Tab.tsx +++ b/src/components/Earn/Tab.tsx @@ -16,7 +16,7 @@ export default function Tab(props: Props) { const { address } = useParams() return ( -
+
+ diff --git a/src/components/Icons/ExternalLink.svg b/src/components/Icons/ExternalLink.svg index c373779b..42aa3a45 100644 --- a/src/components/Icons/ExternalLink.svg +++ b/src/components/Icons/ExternalLink.svg @@ -1,5 +1,8 @@ - + diff --git a/src/components/Icons/GridGlobe.svg b/src/components/Icons/GridGlobe.svg new file mode 100644 index 00000000..adbc2a89 --- /dev/null +++ b/src/components/Icons/GridGlobe.svg @@ -0,0 +1,1020 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Icons/GridHole.svg b/src/components/Icons/GridHole.svg new file mode 100644 index 00000000..d01f25e8 --- /dev/null +++ b/src/components/Icons/GridHole.svg @@ -0,0 +1,1391 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Icons/GridLandscape.svg b/src/components/Icons/GridLandscape.svg new file mode 100644 index 00000000..86781224 --- /dev/null +++ b/src/components/Icons/GridLandscape.svg @@ -0,0 +1,441 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Icons/GridTire.svg b/src/components/Icons/GridTire.svg new file mode 100644 index 00000000..67835846 --- /dev/null +++ b/src/components/Icons/GridTire.svg @@ -0,0 +1,177 @@ + + + + + + + + + diff --git a/src/components/Icons/index.ts b/src/components/Icons/index.ts index 049d6835..1048ec3c 100644 --- a/src/components/Icons/index.ts +++ b/src/components/Icons/index.ts @@ -23,6 +23,10 @@ export { default as ExclamationMarkTriangle } from 'components/Icons/Exclamation export { default as ExternalLink } from 'components/Icons/ExternalLink.svg' export { default as Flag } from 'components/Icons/Flag.svg' export { default as Gear } from 'components/Icons/Gear.svg' +export { default as GridGlobe } from 'components/Icons/GridGlobe.svg' +export { default as GridHole } from 'components/Icons/GridHole.svg' +export { default as GridLandscape } from 'components/Icons/GridLandscape.svg' +export { default as GridTire } from 'components/Icons/GridTire.svg' export { default as HandCoins } from 'components/Icons/HandCoins.svg' export { default as Heart } from 'components/Icons/Heart.svg' export { default as InfoCircle } from 'components/Icons/InfoCircle.svg' diff --git a/src/components/Intro.tsx b/src/components/Intro.tsx index 3e2329c4..40a804bb 100644 --- a/src/components/Intro.tsx +++ b/src/components/Intro.tsx @@ -1,6 +1,7 @@ import { ReactNode } from 'react' import Card from 'components/Card' +import { GridGlobe, GridHole, GridLandscape, GridTire } from 'components/Icons' import Text from 'components/Text' import { Tooltip } from 'components/Tooltip' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' @@ -13,15 +14,31 @@ interface Props { bg: 'borrow' | 'lend' | 'farm' | 'portfolio' } +function IntroBackground(props: { bg: Props['bg'] }) { + switch (props.bg) { + case 'borrow': + return + case 'lend': + return + case 'farm': + return + default: + return + } +} + export default function Intro(props: Props) { const [tutorial] = useLocalStorage(TUTORIAL_KEY, DEFAULT_SETTINGS.tutorial) if (!tutorial) return null return ( +
+ +
- - Balances - - +
+ Balances + {props.children ? ( props.children ) : ( diff --git a/src/components/Portfolio/Account/BreadCrumbs.tsx b/src/components/Portfolio/Account/BreadCrumbs.tsx index 5f49f56c..88d94e4d 100644 --- a/src/components/Portfolio/Account/BreadCrumbs.tsx +++ b/src/components/Portfolio/Account/BreadCrumbs.tsx @@ -1,4 +1,3 @@ -import React from 'react' import { NavLink, useParams } from 'react-router-dom' import { ArrowRight } from 'components/Icons' @@ -15,11 +14,11 @@ export default function PortfolioAccountPageHeader(props: Props) { const selectedAccountId = useAccountId() return ( -
+
Portfolio - + Credit Account {props.accountId}
) diff --git a/src/components/Portfolio/Account/Summary.tsx b/src/components/Portfolio/Account/Summary.tsx index fde81f4f..b0e392b6 100644 --- a/src/components/Portfolio/Account/Summary.tsx +++ b/src/components/Portfolio/Account/Summary.tsx @@ -114,7 +114,7 @@ interface SkeletonProps extends Props { function Skeleton(props: SkeletonProps) { return ( -
+
Credit Account {props.accountId}
diff --git a/src/components/Portfolio/Overview/index.tsx b/src/components/Portfolio/Overview/index.tsx index da736d3e..2d97b2b2 100644 --- a/src/components/Portfolio/Overview/index.tsx +++ b/src/components/Portfolio/Overview/index.tsx @@ -66,7 +66,7 @@ export default function Content() { return (
{accountIds.map((accountId: string, index: number) => { return diff --git a/src/components/Trade/AccountDetailsCard.tsx b/src/components/Trade/AccountDetailsCard.tsx index 2d1aa857..e3ca51a8 100644 --- a/src/components/Trade/AccountDetailsCard.tsx +++ b/src/components/Trade/AccountDetailsCard.tsx @@ -21,17 +21,9 @@ export default function AccountDetailsCard() { [lendingAvailableAssets, accountLentAssets], ) - const tabs = ( -
-
- Balances -
-
- ) - if (account) return ( - + s.swap) const [slippage] = useLocalStorage(SLIPPAGE_KEY, DEFAULT_SETTINGS.slippage) const { computeMaxSwapAmount } = useHealthComputer(account) diff --git a/src/components/Trade/TradeModule/index.tsx b/src/components/Trade/TradeModule/index.tsx index 321549d0..c54846ff 100644 --- a/src/components/Trade/TradeModule/index.tsx +++ b/src/components/Trade/TradeModule/index.tsx @@ -16,7 +16,7 @@ export default function TradeModule(props: Props) { return (
-
-
- - {'Your Address'} - +
+ {'Your Address'} -