Merge branch 'feat/whitelist_munual' into develop

TrustlessComputer · Jan 29, 2024 · b9d497e · b9d497e
2 parents 3daeccb + fe59c88
commit b9d497e
Show file tree

Hide file tree

Showing 15 changed files with 564 additions and 416 deletions.
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -2,16 +2,16 @@ import '@/styles/index.scss';
 
 import { Metadata, Viewport } from 'next';
 
+import StoreProvider from '@/Providers/StoreProvider';
+import { UnisatProvider } from '@/Providers/unisat-context';
+import { UserProvider } from '@/Providers/user-context';
+import { XVerseProvider } from '@/Providers/xverse-context';
+import Hydrated from '@/components/Hydrated';
+import ToastOverlay from '@/components/ToastOverlay';
 import { MetadataConfig, ViewportConfig } from '@/config';
 import chakraThemes from '@/themes/chakra-themes';
 import { ChakraProvider } from '@chakra-ui/react';
-import Hydrated from '@/components/Hydrated';
 import dynamic from 'next/dynamic';
-import StoreProvider from '@/Providers/StoreProvider';
-import { XVerseProvider } from '@/Providers/xverse-context';
-import { UnisatProvider } from '@/Providers/unisat-context';
-import ToastOverlay from '@/components/ToastOverlay';
-import { UserProvider } from '@/Providers/user-context';
 
 export const metadata: Metadata = MetadataConfig;
 export const viewport: Viewport = ViewportConfig;
@@ -31,19 +31,19 @@ export default function RootLayout({
   return (
     <html lang="en">
       <body>
-      <StoreProvider>
-        <ChakraProvider theme={chakraThemes}>
-          <ChakraFontsFace />
-          <UserProvider>
-            <XVerseProvider>
-              <UnisatProvider>
-                <Hydrated>{children}</Hydrated>
-                <ToastOverlay />
-              </UnisatProvider>
-            </XVerseProvider>
-          </UserProvider>
-        </ChakraProvider>
-      </StoreProvider>
+        <StoreProvider>
+          <ChakraProvider theme={chakraThemes}>
+            <ChakraFontsFace />
+            <UserProvider>
+              <XVerseProvider>
+                <UnisatProvider>
+                  <Hydrated>{children}</Hydrated>
+                  <ToastOverlay />
+                </UnisatProvider>
+              </XVerseProvider>
+            </UserProvider>
+          </ChakraProvider>
+        </StoreProvider>
       </body>
     </html>
   );

diff --git a/src/components/BaseModal/index.tsx b/src/components/BaseModal/index.tsx
@@ -1,11 +1,15 @@
-import s from './styles.module.scss';
-import React, { PropsWithChildren } from 'react';
-import cs from 'classnames';
-import { CDN_URL_ICONS } from '@/config';
-import { Modal, ModalHeader, ModalBody, ModalOverlay, ModalContent } from '@chakra-ui/modal';
-import { Flex } from '@chakra-ui/react';
-import { size } from 'valibot';
 import SvgInset from '@/components/SvgInset';
+import {
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+} from '@chakra-ui/modal';
+import { Flex } from '@chakra-ui/react';
+import cs from 'classnames';
+import React, { PropsWithChildren } from 'react';
+import s from './styles.module.scss';
 
 export interface IBaseModalProps {
   isShow: boolean;
@@ -17,7 +21,9 @@ export interface IBaseModalProps {
   headerClassName?: string;
 }
 
-const BaseModal = (props: PropsWithChildren<IBaseModalProps>): React.ReactNode => {
+const BaseModal = (
+  props: PropsWithChildren<IBaseModalProps>,
+): React.ReactNode => {
   const {
     isShow,
     onHide,
@@ -26,40 +32,32 @@ const BaseModal = (props: PropsWithChildren<IBaseModalProps>): React.ReactNode =
     children,
     description,
     headerClassName,
-    size = "normal"
+    size = 'normal',
   } = props;
 
   return (
-      <Modal
-        isOpen={isShow}
-        onClose={onHide}
-        isCentered={true}
-      >
-        <ModalOverlay />
-        <ModalContent className={cs(s.modalContent, s[size], className)}>
-          <ModalHeader className={cs(s.modalHeader, headerClassName)}>
-            <Flex justifyContent="space-between" alignItems="center">
-              <button
-                onClick={onHide}
-                className={s.modalHeader_closeBtn}
-              >
-                <SvgInset className={s.closeIcon} svgUrl={`/icons/ic_close_modal.svg`} />
-              </button>
-              <p className={s.modalHeader_title}>
-                {title}
-              </p>
-            </Flex>
-          </ModalHeader>
-          <ModalBody>
-            {!!description && (
-              <p className={s.modalHeader_description} >
-                {description}
-              </p>
-            )}
-            {children}
-          </ModalBody>
-        </ModalContent>
-      </Modal>
+    <Modal isOpen={isShow} onClose={onHide} isCentered={true}>
+      <ModalOverlay />
+      <ModalContent className={cs(s.modalContent, s[size], className)}>
+        <ModalHeader className={cs(s.modalHeader, headerClassName)}>
+          <Flex justifyContent="space-between" alignItems="center">
+            <button onClick={onHide} className={s.modalHeader_closeBtn}>
+              <SvgInset
+                className={s.closeIcon}
+                svgUrl={`/icons/ic_close_modal.svg`}
+              />
+            </button>
+            <p className={s.modalHeader_title}>{title}</p>
+          </Flex>
+        </ModalHeader>
+        <ModalBody>
+          {!!description && (
+            <p className={s.modalHeader_description}>{description}</p>
+          )}
+          {children}
+        </ModalBody>
+      </ModalContent>
+    </Modal>
   );
 };
 

diff --git a/src/interfaces/leader-board-point.ts b/src/interfaces/leader-board-point.ts
@@ -43,4 +43,5 @@ export interface ILeaderBoardPoint {
   usdt_value?:string;
   bvm_percent?:string;
   coin_balances?:IContributionCoin[];
+  deposit_id:string;
 }