diff --git a/ui/components/layout/Sidebar/ColorsAndSocials.tsx b/ui/components/layout/Sidebar/ColorsAndSocials.tsx index 69b7908c..b44781f3 100644 --- a/ui/components/layout/Sidebar/ColorsAndSocials.tsx +++ b/ui/components/layout/Sidebar/ColorsAndSocials.tsx @@ -19,7 +19,7 @@ const ColorsAndSocials = ({ lightMode, setLightMode }: ColorsAndSocials) => { diff --git a/ui/components/layout/Sidebar/Navigation.ts b/ui/components/layout/Sidebar/Navigation.ts index c7723d05..c5203616 100644 --- a/ui/components/layout/Sidebar/Navigation.ts +++ b/ui/components/layout/Sidebar/Navigation.ts @@ -16,9 +16,10 @@ export const navigation = [ icon: HomeIcon, }, { - name: 'Buy Mooney', + name: 'Buy $MOONEY', href: 'https://app.uniswap.org/#/swap?inputCurrency=ETH&outputCurrency=0x20d4DB1946859E2Adb0e5ACC2eac58047aD41395&chain=mainnet', icon: WalletIcon, + external: true }, { name: 'lockTokens', diff --git a/ui/components/layout/Sidebar/NavigationLink.tsx b/ui/components/layout/Sidebar/NavigationLink.tsx index 6649b804..ac3904d5 100644 --- a/ui/components/layout/Sidebar/NavigationLink.tsx +++ b/ui/components/layout/Sidebar/NavigationLink.tsx @@ -4,12 +4,26 @@ import useTranslation from 'next-translate/useTranslation' import Link from 'next/link' import { useRouter } from 'next/router' +//Checks if the navigation object has a property 'external' set to true, if so returns a link that opens another tab, otherwise checks if the navigation object has children. If it does, it returns the dropdown, if it doesn't it returns an internal navigation link. + const NavigationLink = ({ item }: any) => { const router = useRouter() const { t } = useTranslation('common') return (
  • - {!item.children ? ( + {item.external ? ( + +
    + + {t(item.name)} +
    + + ) : !item.children ? (
    -

    +

    {label}

    @@ -109,7 +109,7 @@ export default function Product({ {/*Product pagination*/}
    {/*Quantity and total */}
    -

    +

    {'Quantity:'} - {quantity} + {quantity}

    -

    +

    {'Total:'} - {`$${ + {`$${ product?.variants ? (product.variants[0].price.amount * quantity).toFixed(2) : 0 @@ -178,10 +178,10 @@ export default function Product({

    diff --git a/ui/pages/lifeship/detail.tsx b/ui/pages/lifeship/detail.tsx deleted file mode 100644 index 813075d6..00000000 --- a/ui/pages/lifeship/detail.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { useRouter } from 'next/router' -import WebsiteHead from '../../components/layout/Head' -import MainCard from '../../components/layout/MainCard' - -export default function LifeshipNFTDetail() { - const router = useRouter() - return ( -
    - - -

    - Lifeship NFT Details -

    -

    {`MoonDAO is partnering with lifeship to send NFTs to space! Please upload a file and complete the checkout. You will be emailed instrucitons to claim your NFT.`}

    -
    - -
    -
    -
    - ) -} diff --git a/ui/pages/lifeship/index.tsx b/ui/pages/lifeship/index.tsx index fead233b..1bf1270c 100644 --- a/ui/pages/lifeship/index.tsx +++ b/ui/pages/lifeship/index.tsx @@ -69,7 +69,7 @@ export default function Lifeship({ products = [] }: any) { Lifeship Logo
    -

    +

    Join us on our first mission to the Moon!

    {state === 0 && ( diff --git a/ui/pages/lock.tsx b/ui/pages/lock.tsx index 389da5be..8efb082a 100644 --- a/ui/pages/lock.tsx +++ b/ui/pages/lock.tsx @@ -30,6 +30,7 @@ import { NumberType, transformNumber } from '../lib/utils/numbers' import Balance from '../components/Balance' import TimeRange from '../components/TimeRange' import Head from '../components/layout/Head' +import Header from '../components/layout/Header' import L2Toggle from '../components/lock/L2Toggle' import { AllowanceWarning } from '../components/thirdweb/AllowanceWarning' import LockPresets from '../components/thirdweb/LockPresets' @@ -230,9 +231,15 @@ export default function Lock() {
    - - -
    +
    + +
    + + +
    + +
    +
    {/*Lock Data*/} {hasLock && ( <> @@ -287,7 +294,7 @@ export default function Lock() { )}
    -
    +