move imported tokens to a separate file

dfinity · Jul 25, 2024 · 2d4c3be · 2d4c3be
1 parent d914ee4
commit 2d4c3be
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 38 deletions.
diff --git a/frontend/src/lib/api/canisters.api.ts b/frontend/src/lib/api/canisters.api.ts
@@ -11,8 +11,6 @@ import {
 } from "$lib/canisters/nns-dapp/nns-dapp.errors";
 import type {
   CanisterDetails as CanisterInfo,
-  ImportedToken,
-  ImportedTokens,
   SubAccountArray,
 } from "$lib/canisters/nns-dapp/nns-dapp.types";
 import {
@@ -378,33 +376,3 @@ const canisters = async (
 
   return { cmc, icMgt, nnsDapp };
 };
-
-export const getImportedTokens = async ({
-  identity,
-}: {
-  identity: Identity;
-}): Promise<ImportedTokens> => {
-  logWithTimestamp("Getting imported tokens call...");
-  const { nnsDapp } = await canisters(identity);
-
-  const importedTokens = await nnsDapp.getImportedTokens();
-
-  logWithTimestamp("Getting imported tokens call complete.");
-
-  return importedTokens;
-};
-
-export const setImportedTokens = async ({
-  identity,
-  importedTokens,
-}: {
-  identity: Identity;
-  importedTokens: Array<ImportedToken>;
-}): Promise<void> => {
-  logWithTimestamp("Setting imported tokens call...");
-  const { nnsDapp } = await canisters(identity);
-
-  await nnsDapp.setImportedTokens(importedTokens);
-
-  logWithTimestamp("Setting imported tokens call complete.");
-};
diff --git a/frontend/src/lib/api/imported-tokens.api.ts b/frontend/src/lib/api/imported-tokens.api.ts
@@ -0,0 +1,39 @@
+import { nnsDappCanister } from "$lib/api/nns-dapp.api";
+import type {
+  ImportedToken,
+  ImportedTokens,
+} from "$lib/canisters/nns-dapp/nns-dapp.types";
+import { logWithTimestamp } from "$lib/utils/dev.utils";
+import type { Identity } from "@dfinity/agent";
+
+export const getImportedTokens = async ({
+  identity,
+  certified,
+}: {
+  identity: Identity;
+  certified: boolean;
+}): Promise<ImportedTokens> => {
+  logWithTimestamp(`Getting imported tokens:${certified} call...`);
+
+  const { canister: nnsDapp } = await nnsDappCanister({ identity });
+  const response = await nnsDapp.getImportedTokens({ certified });
+
+  logWithTimestamp(`Getting imported tokens:${certified} complete`);
+
+  return response;
+};
+
+export const setImportedTokens = async ({
+  identity,
+  importedTokens,
+}: {
+  identity: Identity;
+  importedTokens: Array<ImportedToken>;
+}): Promise<void> => {
+  logWithTimestamp("Setting imported tokens call...");
+
+  const { canister: nnsDapp } = await nnsDappCanister({ identity });
+  await nnsDapp.setImportedTokens(importedTokens);
+
+  logWithTimestamp("Setting imported tokens call complete.");
+};
diff --git a/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.ts b/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.ts
@@ -328,8 +328,13 @@ export class NNSDappCanister {
     );
   }
 
-  public getImportedTokens = async (): Promise<ImportedTokens> => {
-    const response = await this.certifiedService.get_imported_tokens();
+  public getImportedTokens = async ({
+    certified,
+  }: {
+    certified: boolean;
+  }): Promise<ImportedTokens> => {
+    const response =
+      await this.getNNSDappService(certified).get_imported_tokens();
     if ("Ok" in response) {
       return response.Ok;
     }

diff --git a/frontend/src/tests/lib/api/canisters.api.spec.ts b/frontend/src/tests/lib/api/canisters.api.spec.ts
@@ -442,9 +442,13 @@ describe("canisters-api", () => {
       expect(mockNNSDappCanister.getImportedTokens).not.toBeCalled();
       await getImportedTokens({
         identity: mockIdentity,
+        certified: true,
       });
 
       expect(mockNNSDappCanister.getImportedTokens).toBeCalledTimes(1);
+      expect(mockNNSDappCanister.getImportedTokens).toBeCalledWith({
+        certified: true,
+      });
     });
   });
 

diff --git a/frontend/src/tests/lib/canisters/nns-dapp.canister.spec.ts b/frontend/src/tests/lib/canisters/nns-dapp.canister.spec.ts
@@ -489,9 +489,12 @@ describe("NNSDapp", () => {
 
       expect(service.get_imported_tokens).not.toBeCalled();
 
-      await nnsDapp.getImportedTokens();
+      await nnsDapp.getImportedTokens({ certified: true });
 
       expect(service.get_imported_tokens).toBeCalledTimes(1);
+      expect(service.get_imported_tokens).toBeCalledWith({
+        certified: true,
+      });
     });
 
     it("should return imported tokens", async () => {
@@ -502,7 +505,7 @@ describe("NNSDapp", () => {
         },
       });
       const nnsDapp = await createNnsDapp(service);
-      const result = await nnsDapp.getImportedTokens();
+      const result = await nnsDapp.getImportedTokens({ certified: true });
 
       expect(result).toEqual({
         imported_tokens: [mockImportedToken],
@@ -518,7 +521,7 @@ describe("NNSDapp", () => {
 
       const nnsDapp = await createNnsDapp(service);
 
-      const call = async () => nnsDapp.getImportedTokens();
+      const call = async () => nnsDapp.getImportedTokens({ certified: true });
 
       await expect(call).rejects.toThrow(AccountNotFoundError);
     });
@@ -534,7 +537,7 @@ describe("NNSDapp", () => {
 
       const nnsDapp = await createNnsDapp(service);
 
-      const call = async () => nnsDapp.getImportedTokens();
+      const call = async () => nnsDapp.getImportedTokens({ certified: true });
 
       await expect(call).rejects.toThrow(
         'Error getting imported tokens {"UnexpectedError":"message"}'