[GSM-471] fix: Fix test ci, import

gnoswap-labs · Dec 20, 2023 · 4ed8373 · 4ed8373
1 parent ebcdd43
commit 4ed8373
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/packages/web/src/components/common/notice/NoticeToast.tsx b/packages/web/src/components/common/notice/NoticeToast.tsx
@@ -3,7 +3,7 @@ import {
   INoticeContext,
   NoticeContext,
   TNoticeType,
-} from "src/context/NoticeContext";
+} from "@context/NoticeContext";
 import IconClose from "../icons/IconCancel";
 import IconFailed from "../icons/IconFailed";
 import IconNewTab from "../icons/IconNewTab";

diff --git a/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.spec.tsx b/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.spec.tsx
@@ -3,7 +3,9 @@ import { Provider as JotaiProvider } from "jotai";
 import GnoswapThemeProvider from "@providers/gnoswap-theme-provider/GnoswapThemeProvider";
 import WithDrawModal from "./WithDrawModal";
 import { DEVICE_TYPE } from "@styles/media";
-import { TokenModel } from "@models/token/token-model";
+import Notice from "@components/common/notice/NoticeToast";
+import GnoswapServiceProvider from "@providers/gnoswap-service-provider/GnoswapServiceProvider";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
 describe("WithDrawModal Component", () => {
   it("WithDrawModal render", () => {
@@ -51,14 +53,28 @@ describe("WithDrawModal Component", () => {
       connected: true,
       changeToken: () => null,
       close: () => null,
-    };
-
+    } as const;
+    const queryClient = new QueryClient({
+      defaultOptions: {
+        queries: {
+          refetchOnMount: false,
+          refetchOnReconnect: false,
+          refetchOnWindowFocus: false,
+        },
+      },
+    });
     render(
-      <JotaiProvider>
-        <GnoswapThemeProvider>
-          <WithDrawModal {...mockProps} />
-        </GnoswapThemeProvider>
-      </JotaiProvider>,
+      <QueryClientProvider client={queryClient}>
+        <JotaiProvider>
+          <GnoswapServiceProvider>
+            <GnoswapThemeProvider>
+              <Notice>
+                <WithDrawModal {...mockProps} />
+              </Notice>
+            </GnoswapThemeProvider>
+          </GnoswapServiceProvider>
+        </JotaiProvider>
+      </QueryClientProvider>
     );
   });
 });
diff --git a/packages/web/src/components/wallet/withdraw-modal/useWithdrawTokens.tsx b/packages/web/src/components/wallet/withdraw-modal/useWithdrawTokens.tsx
@@ -6,7 +6,7 @@ import {
 } from "@repositories/wallet/request";
 import { makeRandomId, parseJson } from "@utils/common";
 import { useState } from "react";
-import { TNoticeType } from "src/context/NoticeContext";
+import { TNoticeType } from "@context/NoticeContext";
 
 type Request = TransferGRC20TokenRequest | TransferNativeTokenRequest;
 export type WithdrawResponse = {

diff --git a/packages/web/src/hooks/common/use-notice.ts b/packages/web/src/hooks/common/use-notice.ts
@@ -1,5 +1,5 @@
 import { useContext } from "react";
-import { NoticeContext } from "src/context/NoticeContext";
+import { NoticeContext } from "@context/NoticeContext";
 
 export const useNotice = () => {
   return useContext(NoticeContext);

diff --git a/packages/web/src/models/token/token-model.ts b/packages/web/src/models/token/token-model.ts
@@ -26,8 +26,6 @@ export interface TokenModel {
 
   createdAt: string;
 
-  createdat?: string;
-
   isWrappedGasToken?: boolean;
 
   isGasToken?: boolean;

diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json
@@ -29,7 +29,8 @@
       "@styles/*": ["src/styles/*"],
       "@layouts/*": ["src/layouts/*"],
       "@models/*": ["src/models/*"],
-      "@query/*": ["src/react-query/*"]
+      "@query/*": ["src/react-query/*"],
+      "@context/*": ["src/context/*"]
     },
     "jsxImportSource": "@emotion/react"
   },