From 8f4fed905380c50e77b80a185b395cebcd35da28 Mon Sep 17 00:00:00 2001 From: venuswhispers Date: Sat, 11 Jan 2025 13:04:12 -0600 Subject: [PATCH] fixed: bridge2 notification issue --- .../src/components/lux/teleport/swap/Form.tsx | 9 ++++-- app/server/package.json | 1 + app/server/src/delete.ts | 29 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 app/server/src/delete.ts diff --git a/app/bridge/src/components/lux/teleport/swap/Form.tsx b/app/bridge/src/components/lux/teleport/swap/Form.tsx index 5c2deba7..21a9f86b 100644 --- a/app/bridge/src/components/lux/teleport/swap/Form.tsx +++ b/app/bridge/src/components/lux/teleport/swap/Form.tsx @@ -17,6 +17,7 @@ import { SWAP_PAIRS } from '@/components/lux/teleport/constants/settings' import useWallet from '@/hooks/useWallet' import useAsyncEffect from 'use-async-effect' import { useAtom } from 'jotai' +import { useNotify } from '@/context/toast-provider' import { useRouter } from 'next/navigation' import { useSettings } from '@/context/settings' import { useServerAPI } from '@/hooks/useServerAPI' @@ -57,6 +58,8 @@ const Swap: FC = () => { const [tokenPrice, setTokenPrice] = React.useState(0) const [flipInProgress, setFlipInProgress] = React.useState(false) + const { notify } = useNotify() + // hooks const router = useRouter() const { serverAPI } = useServerAPI() @@ -186,6 +189,7 @@ const Swap: FC = () => { console.log('::swap creation response:', response.data.data) router.push(`/swap/teleporter/${response.data?.data?.swap_id}`) } catch (err) { + notify(String(err), 'warn') console.log(err) } finally { setIsSubmitting(false) @@ -193,7 +197,7 @@ const Swap: FC = () => { } const handleSwap = () => { - if (sourceNetwork && sourceAsset && destinationNetwork && destinationNetwork && destinationAddress && Number(sourceAmount) > 0) { + if (sourceNetwork && sourceAsset && destinationNetwork && destinationNetwork && destinationAddress && Number(sourceAmount) > 0 && warningMessage === 'Create Swap') { createSwap() setIsSubmitting(true) } @@ -317,7 +321,8 @@ const Swap: FC = () => { !sourceAmount || Number(sourceAmount) <= 0 || isSubmitting || - !address + !address || + warningMessage !== 'Create Swap' } className="border -mb-3 border-muted-3 disabled:border-[#404040] items-center space-x-1 disabled:opacity-80 disabled:cursor-not-allowed relative w-full flex justify-center font-semibold rounded-md transform transition duration-200 ease-in-out hover:bg-primary-hover bg-primary-lux text-primary-fg disabled:hover:bg-primary-lux py-3 px-2 md:px-3 plausible-event-name=Swap+initiated" > diff --git a/app/server/package.json b/app/server/package.json index fa0fb30b..57ecc142 100644 --- a/app/server/package.json +++ b/app/server/package.json @@ -9,6 +9,7 @@ "scripts": { "dev": "nodemon", "db": "node dist/db.js", + "rm": "node dist/delete.js", "nodes": "node dist/nodes.js", "tc": "tsc", "typecheck": "tsc", diff --git a/app/server/src/delete.ts b/app/server/src/delete.ts new file mode 100644 index 00000000..3999bdf4 --- /dev/null +++ b/app/server/src/delete.ts @@ -0,0 +1,29 @@ +import { prisma } from "./prisma-instance" + +const main = async () => { + try { + const arvs = process.argv.slice(2) + const swapId = arvs[0] + if (swapId) { + await prisma.depositAction.deleteMany({ + where: { swap_id: swapId } + }) + // Delete related Transactions + await prisma.transaction.deleteMany({ + where: { swap_id: swapId } + }) + // Delete related Quote + await prisma.quote.deleteMany({ + where: { swap_id: swapId } + }) + // Finally, delete the Swap + const deletedSwap = await prisma.swap.delete({ + where: { id: swapId } + }) + } + } catch (err) { + // + } +} + +main()