diff --git a/bread.theme.ts b/bread.theme.ts index 742cd86c..950977c6 100644 --- a/bread.theme.ts +++ b/bread.theme.ts @@ -30,6 +30,8 @@ const colors = { status: { danger: "#D8745C", "danger-light": "#CF2800", + "danger-alpha": "rgba(214, 115, 91, 1)", + "danger-light-alpha": "rgba(207, 40, 0, 0.1)", warning: "#F2D54E", success: "#9EC958", }, diff --git a/src/app/app.css b/src/app/app.css index a2d3600f..a590fb7b 100644 --- a/src/app/app.css +++ b/src/app/app.css @@ -56,15 +56,13 @@ .dark .guild-logo-dark { display: block; } - .supply-text-gradient { + + .bread-pink-text-gradient { background: linear-gradient( - 230deg, - #b72085 9.16%, - #cd19aa 16.07%, - #c463ca 35.44%, - #f5ac37 50.56%, - #f9c625 73.38%, - #ffe70f 95.3% + 81.66deg, + #fc6baa 6.39%, + #d158d7 57.5%, + #af2cec 100.16% ); background-clip: text; -webkit-background-clip: text; diff --git a/src/app/bakery/components/Swap/Burn.tsx b/src/app/bakery/components/Swap/Burn.tsx index 0a822cd1..e8e962e9 100644 --- a/src/app/bakery/components/Swap/Burn.tsx +++ b/src/app/bakery/components/Swap/Burn.tsx @@ -1,6 +1,5 @@ import { useContractWrite, usePrepareContractWrite } from "wagmi"; import { parseEther } from "viem"; - import { TUserConnected } from "@/app/core/hooks/useConnectedUser"; import { BREAD_ABI } from "@/abi"; import Button from "@/app/core/components/Button"; @@ -11,6 +10,8 @@ import { useEffect, useState } from "react"; import SafeAppsSDK from "@safe-global/safe-apps-sdk/dist/src/sdk"; import { TransactionStatus } from "@safe-global/safe-apps-sdk"; import { useModal } from "@/app/core/context/ModalContext"; +import { ExternalLink } from "@/app/core/components/ExternalLink"; +import SwapBreadButton from "@/app/bakery/components/Swap/SwapBreadButton"; export default function Burn({ user, @@ -25,10 +26,8 @@ export default function Burn({ }) { const { transactionsState, transactionsDispatch } = useTransactions(); const [buttonIsEnabled, setButtonIsEnabled] = useState(false); - const { setModal } = useModal(); - const { BREAD } = getConfig(user.chain.id); - + const { setModal } = useModal(); const debouncedValue = useDebounce(inputValue, 500); const parsedValue = parseEther( @@ -114,26 +113,22 @@ export default function Burn({ return (
+
+ +
+
+ + + ); +} diff --git a/src/app/core/components/Modal/ModalPresenter.tsx b/src/app/core/components/Modal/ModalPresenter.tsx index 747ac2b6..9eac8772 100644 --- a/src/app/core/components/Modal/ModalPresenter.tsx +++ b/src/app/core/components/Modal/ModalPresenter.tsx @@ -3,6 +3,7 @@ import * as Dialog from "@radix-ui/react-dialog"; import { AnimatePresence, motion } from "framer-motion"; import { useModal } from "@/app/core/context/ModalContext"; import { ConfirmRecastModal } from "./ConfirmRecastModal"; +import { ConfirmBurnModal } from "./ConfirmBurnModal"; import { ModalOverlay } from "./ModalUI"; import { VoteTransactionModal } from "./TransactionModal/VoteTransactionModal"; import { BakeryTransactionModal } from "./TransactionModal/BakeryTransactionModal"; @@ -27,6 +28,8 @@ export function ModalPresenter() { return ; case "VOTE_TRANSACTION": return ; + case "CONFIRM_BURN": + return ; case "CONFIRM_RECAST": return ; case "LP_VAULT_TRANSACTION": diff --git a/src/app/core/components/Modal/ModalUI.tsx b/src/app/core/components/Modal/ModalUI.tsx index 41b8c4e5..3089a8d4 100644 --- a/src/app/core/components/Modal/ModalUI.tsx +++ b/src/app/core/components/Modal/ModalUI.tsx @@ -23,7 +23,7 @@ export const ModalContainer = forwardRef( animate={{ y: 0, opacity: 1 }} exit={{ y: 8, opacity: 0 }} transition={{ duration: 0.2 }} - className="max-w-[26rem] flex flex-col items-center rounded dark:bg-opacity-100 p-4 bg-breadgray-ultra-white border border-breadgray-light-grey dark:border-none dark:bg-breadgray-charcoal relative pointer-events-auto" + className="max-w-[30rem] flex flex-col items-center rounded dark:bg-opacity-100 p-4 bg-breadgray-ultra-white border border-breadgray-light-grey dark:border-none dark:bg-breadgray-charcoal relative pointer-events-auto" > diff --git a/src/app/core/context/ModalContext.tsx b/src/app/core/context/ModalContext.tsx index ce860e02..92da42dd 100644 --- a/src/app/core/context/ModalContext.tsx +++ b/src/app/core/context/ModalContext.tsx @@ -6,6 +6,13 @@ export type RecastModalState = { isConfirmed: boolean; }; +export type ConfirmBurnModalState = { + type: "CONFIRM_BURN"; + breadValue: string; + xdaiValue: string; + write: Function | undefined; +}; + export type VoteModalState = { type: "VOTE_TRANSACTION"; hash: string | null; @@ -26,6 +33,7 @@ export type ModalState = | BakeryTransactionModalState | VoteModalState | RecastModalState + | ConfirmBurnModalState | LPVaultTransactionModalState | null; export type ModalContext = {