+ 
-
+
-
+
- {Extension.version} + {version}
diff --git a/src/pages/balance/components/SignOut.tsx b/src/pages/balance/components/SignOut.tsx index d4fbc59e..8d698a76 100644 --- a/src/pages/balance/components/SignOut.tsx +++ b/src/pages/balance/components/SignOut.tsx @@ -1,14 +1,14 @@ import { useNavigate } from "react-router-dom"; import { FooterIcon } from "./FooterIcon" -import Extension from "@src/Extension"; import { SIGNIN } from "@src/routes/paths"; import { MdOutlineLock } from "react-icons/md"; +import { messageAPI } from "@src/messageAPI/api"; export const SignOut = () => { const navigate = useNavigate(); const signOut = async () => { - await Extension.signOut(); + await messageAPI.signOut() navigate(SIGNIN); }; diff --git a/src/pages/callContract/CallContract.tsx b/src/pages/callContract/CallContract.tsx index 19257e29..61da60c9 100644 --- a/src/pages/callContract/CallContract.tsx +++ b/src/pages/callContract/CallContract.tsx @@ -13,10 +13,10 @@ import { BN0, BigNumber0, PROOF_SIZE, REF_TIME } from "@src/constants/assets"; import { formatBN } from "@src/utils/assets"; import { BN } from "@polkadot/util"; import { Keyring } from "@polkadot/api"; -import Extension from "@src/Extension"; import { SubmittableExtrinsic } from "@polkadot/api/types"; import { getWebAPI } from "@src/utils/env"; import { BigNumber, Contract, ethers, utils } from "ethers"; +import { messageAPI } from "@src/messageAPI/api"; const WebAPI = getWebAPI(); @@ -149,7 +149,7 @@ export const CallContract: FC{t("from")}:
-{t("to")}:
{t("destination_account")}
-{t("amount")}
-![{"blockcoders"}]({"/images/blockcoders.png"})
{
const { t } = useTranslation("advanced_settings");
@@ -25,7 +25,7 @@ export const Advanced = () => {
const getSettings = async () => {
try {
- const settings = await Extension.getAdvancedSettings();
+ const settings = await messageAPI.getAdvancedSettings();
setSettings(settings);
} catch (error) {
setSettings([]);
diff --git a/src/pages/settings/Contacts.test.tsx b/src/pages/settings/Contacts.test.tsx
index fce803b5..69ace5fc 100644
--- a/src/pages/settings/Contacts.test.tsx
+++ b/src/pages/settings/Contacts.test.tsx
@@ -12,18 +12,35 @@ const renderComponent = () => {
);
};
+const saveContact = vi.fn().mockResolvedValue([]);
+
+
describe("Contacts", () => {
beforeAll(() => {
vi.mock("react-router-dom", () => ({
useNavigate: () => vi.fn(),
}));
-
- vi.mock("@src/Extension");
+ vi.mock("@src/storage/entities/registry/Contact", () => ({
+ default: class Contact {
+ constructor() { }
+ }
+ }))
+ vi.mock("@src/storage/entities/BaseEntity", () => ({
+ default: class BaseEntity {
+ constructor() { }
+ }
+ }))
+ vi.mock("@src/messageAPI/api", () => ({
+ messageAPI: {
+ getContacts: vi.fn().mockReturnValue([]),
+ saveContact: () => saveContact(),
+ }
+ }))
});
it("should render", async () => {
- const _Extension = (await import("@src/Extension")).default;
- _Extension.getContacts = vi.fn().mockResolvedValue([
+ const Default = await import("@src/messageAPI/api")
+ Default.messageAPI.getContacts = vi.fn().mockResolvedValue([
{
name: "alice",
address: "0x123",
@@ -43,8 +60,8 @@ describe("Contacts", () => {
});
it("should show no contacts", async () => {
- const _Extension = (await import("@src/Extension")).default;
- _Extension.getContacts = vi.fn().mockResolvedValue([]);
+ const Default = await import("@src/messageAPI/api")
+ Default.messageAPI.getContacts = vi.fn().mockResolvedValue([]);
const { getByText } = renderComponent();
@@ -55,10 +72,9 @@ describe("Contacts", () => {
});
it("should create contact", async () => {
- const saveContact = vi.fn().mockResolvedValue([]);
- const _Extension = (await import("@src/Extension")).default;
- _Extension.getContacts = vi.fn().mockResolvedValue([]);
- _Extension.saveContact = saveContact;
+ const Default = await import("@src/messageAPI/api")
+ Default.messageAPI.getContacts = vi.fn().mockResolvedValue([]);
+ Default.messageAPI.saveContact = saveContact;
const { getByText, getByTestId } = renderComponent();
diff --git a/src/pages/settings/Contacts.tsx b/src/pages/settings/Contacts.tsx
index 4bb497b5..02abeb97 100644
--- a/src/pages/settings/Contacts.tsx
+++ b/src/pages/settings/Contacts.tsx
@@ -1,25 +1,25 @@
-import {useState, useEffect, useMemo} from "react";
-import {ICON_SIZE} from "@src/constants/icons";
-import {FiChevronLeft} from "react-icons/fi";
-import {useNavigate} from "react-router-dom";
+import { useState, useEffect, useMemo } from "react";
+import { ICON_SIZE } from "@src/constants/icons";
+import { FiChevronLeft } from "react-icons/fi";
+import { useNavigate } from "react-router-dom";
import Contact from "@src/storage/entities/registry/Contact";
-import {useTranslation} from "react-i18next";
-import {useToast} from "@src/hooks";
-import Extension from "@src/Extension";
+import { useTranslation } from "react-i18next";
+import { useToast } from "@src/hooks";
import {
Button,
InputErrorMessage,
Loading,
PageWrapper,
} from "@src/components/common";
-import {BsTrash} from "react-icons/bs";
-import {useForm} from "react-hook-form";
-import {object, string} from "yup";
-import {yupResolver} from "@hookform/resolvers/yup";
-import {decodeAddress, encodeAddress, isAddress} from "@polkadot/util-crypto";
-import {isHex} from "@polkadot/util";
-import {captureError} from "@src/utils/error-handling";
-import {useThemeContext} from "@src/providers";
+import { BsTrash } from "react-icons/bs";
+import { useForm } from "react-hook-form";
+import { object, string } from "yup";
+import { yupResolver } from "@hookform/resolvers/yup";
+import { decodeAddress, encodeAddress, isAddress } from "@polkadot/util-crypto";
+import { isHex } from "@polkadot/util";
+import { captureError } from "@src/utils/error-handling";
+import { useThemeContext } from "@src/providers";
+import { messageAPI } from "@src/messageAPI/api";
interface AccountForm {
name: string;
@@ -27,9 +27,9 @@ interface AccountForm {
}
export const Contacts = () => {
- const {t} = useTranslation("contacts");
- const {t: tCommon} = useTranslation("common");
- const {color} = useThemeContext();
+ const { t } = useTranslation("contacts");
+ const { t: tCommon } = useTranslation("common");
+ const { color } = useThemeContext();
const navigate = useNavigate();
const schema = object({
@@ -62,7 +62,7 @@ export const Contacts = () => {
register,
handleSubmit,
reset,
- formState: {errors},
+ formState: { errors },
} = useForm