chore: merge

src/components/ProjectDetailCard/index.tsx

@@ -48,10 +48,6 @@ export function ProjectDetailCard({ setIsOpen }: ProjectCardProps) {
         },
     });
 
-<<<<<<< HEAD
-=======
-    const setIsOpen = useStakeModalStore((state) => state.setIsOpen);
->>>>>>> 3b715a99e57775ccecead4a5c5fdc36657b34c78
 
     const statusText = useMemo(() => {
         if (!poolInfo) return 'Not started';

src/components/StakeModal/index.tsx

@@ -1,9 +1,9 @@
 'use client';
 
-import { Dialog, Transition } from '@headlessui/react'
-import { Fragment } from 'react'
+import { Dialog, Transition } from '@headlessui/react';
+import { Fragment } from 'react';
+import { StakeTokenInput } from './StakeTokenInput/index.js';
 
-import { StakeTokenInput } from '@/components/StakeModal/StakeTokenInput/index.js'
 
 interface StakeModalProps {
   isOpen: boolean
@@ -12,7 +12,13 @@ interface StakeModalProps {
 export function StakeModal({ isOpen, setIsOpen }: StakeModalProps) {
   return (
     <Transition appear show={isOpen} as={Fragment}>
-      <Dialog as="div" className="relative z-50" onClose={() => { setIsOpen(false) }}>
+      <Dialog
+        as="div"
+        className="relative z-50"
+        onClose={() => {
+          setIsOpen(false);
+        }}
+      >
         <Transition.Child
           as={Fragment}
           enter="ease-out duration-300"
@@ -36,36 +42,13 @@ export function StakeModal({ isOpen, setIsOpen }: StakeModalProps) {
               leaveFrom="opacity-100 scale-100"
               leaveTo="opacity-0 scale-95"
             >
-              <Transition.Child
-                as={Fragment}
-                enter="ease-out duration-300"
-                enterFrom="opacity-0"
-                enterTo="opacity-100"
-                leave="ease-in duration-200"
-                leaveFrom="opacity-100"
-                leaveTo="opacity-0"
-              >
-                <div className="fixed inset-0 bg-black/25" />
-              </Transition.Child>
-
-              <div className="fixed inset-0 overflow-y-auto">
-                <div className="flex min-h-full items-center justify-center p-4 text-center">
-                  <Transition.Child
-                    as={Fragment}
-                    enter="ease-out duration-300"
-                    enterFrom="opacity-0 scale-95"
-                    enterTo="opacity-100 scale-100"
-                    leave="ease-in duration-200"
-                    leaveFrom="opacity-100 scale-100"
-                    leaveTo="opacity-0 scale-95"
-                  >
-                    <Dialog.Panel className="z-[999] w-full max-w-[630px] transform overflow-hidden rounded-2xl bg-neutrals8 p-[24px] text-left align-middle shadow-xl transition-all">
-                      <StakeTokenInput onClose={() => setIsOpen(false)} />
-                    </Dialog.Panel>
-                  </Transition.Child>
-                </div>
-              </div>
-            </Dialog>
-          </Transition>
-          );
+              <Dialog.Panel className="z-[999] w-full max-w-[630px] transform overflow-hidden rounded-2xl bg-neutrals8 p-[24px] text-left align-middle shadow-xl transition-all">
+                <StakeTokenInput onClose={() => setIsOpen(false)} />
+              </Dialog.Panel>
+            </Transition.Child>
+          </div>
+        </div>
+      </Dialog>
+    </Transition>
+  );
 }