Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 72 additions & 58 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^13.5.0",
"@tonconnect/ui-react": "^2.0.11",
"@tonconnect/ui-react": "^5.0.1",
"@types/jest": "^27.5.1",
"@types/node": "^16.11.36",
"@types/react": "^18.0.9",
Expand Down
61 changes: 59 additions & 2 deletions src/components/form/Form.test.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
import { Form } from "./Form";
import { offchainFormSpec, onchainFormSpec } from "pages/deployer/data";

const mockShowNotification = jest.fn();
const mockDiscardLogoDraft = jest.fn();
const mockOpenModal = jest.fn().mockResolvedValue(undefined);
const mockTonConnectUI = { connected: false, openModal: mockOpenModal };
let mockConnectedAddress = "EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c";
let mockConnectionRestored = true;

jest.mock("@tonconnect/ui-react", () => ({
useTonAddress: () => "EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c",
useTonAddress: () => mockConnectedAddress,
useTonConnectUI: () => [mockTonConnectUI],
useIsConnectionRestored: () => mockConnectionRestored,
}));

jest.mock("hooks/useJettonAddress", () => ({
Expand Down Expand Up @@ -34,6 +40,57 @@ jest.mock("hooks/useNotification", () => () => ({
jest.mock("components/editLogoPopup", () => ({ EditLogoPopup: () => null }));
jest.mock("components/logoAlertPopup", () => ({ LogoAlertPopup: () => null }));

beforeEach(() => {
mockConnectedAddress = "EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c";
mockConnectionRestored = true;
mockTonConnectUI.connected = false;
mockOpenModal.mockClear();
});

test("opens the wallet modal without a header wallet button or submitting the form", async () => {
mockConnectedAddress = "";
const onSubmit = jest.fn();
render(<Form onSubmit={onSubmit} inputs={[]} submitText="Deploy" />);

fireEvent.click(screen.getByRole("button", { name: "Connect Wallet" }));
await act(async () => Promise.resolve());

expect(mockOpenModal).toHaveBeenCalledTimes(1);
expect(onSubmit).not.toHaveBeenCalled();
});

test("waits for connection restoration before allowing a new connection", async () => {
mockConnectedAddress = "";
mockConnectionRestored = false;
const onSubmit = jest.fn();
const view = render(<Form onSubmit={onSubmit} inputs={[]} submitText="Deploy" />);

expect(screen.getByRole("button", { name: "Connect Wallet" })).toBeDisabled();
fireEvent.click(screen.getByRole("button", { name: "Connect Wallet" }));
expect(mockOpenModal).not.toHaveBeenCalled();

mockConnectionRestored = true;
view.rerender(<Form onSubmit={onSubmit} inputs={[]} submitText="Deploy" />);
expect(screen.getByRole("button", { name: "Connect Wallet" })).toBeEnabled();
fireEvent.click(screen.getByRole("button", { name: "Connect Wallet" }));
await act(async () => Promise.resolve());
expect(mockOpenModal).toHaveBeenCalledTimes(1);
expect(onSubmit).not.toHaveBeenCalled();
});

test("does not open a new connection when the wallet connects before React rerenders", async () => {
mockConnectedAddress = "";
const onSubmit = jest.fn();
render(<Form onSubmit={onSubmit} inputs={[]} submitText="Deploy" />);

mockTonConnectUI.connected = true;
fireEvent.click(screen.getByRole("button", { name: "Connect Wallet" }));
await act(async () => Promise.resolve());

expect(mockOpenModal).not.toHaveBeenCalled();
expect(onSubmit).not.toHaveBeenCalled();
});

test("numeric form examples are stored as strings", () => {
const numericInputs = [...onchainFormSpec, ...offchainFormSpec].filter(
(input) => input.type === "number",
Expand Down
12 changes: 9 additions & 3 deletions src/components/form/Form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import { StyledTopImg } from "pages/jetton/styled";
import LoadingImage from "components/LoadingImage";
import { AppHeading } from "components/appHeading";
import { useJettonAddress } from "hooks/useJettonAddress";
import { useTonAddress } from "@tonconnect/ui-react";
import { onConnect } from "utils";
import { useIsConnectionRestored, useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";

interface FormProps {
onSubmit: (values: any) => Promise<void>;
Expand All @@ -43,6 +42,8 @@ export function Form({
}: FormProps) {
const { showNotification } = useNotification();
const address = useTonAddress();
const [tonConnectUI] = useTonConnectUI();
const connectionRestored = useIsConnectionRestored();
const { jettonLogo, setIconHover, discardLogoDraft } = useJettonLogo();
const [logoAlertPopup, setLogoAlertPopup] = useState(false);
const [editLogoPopup, setEditLogoPopup] = useState(false);
Expand Down Expand Up @@ -189,7 +190,12 @@ export function Form({
width={150}
fontWeight={700}
type="button"
onClick={onConnect}
disabled={!connectionRestored}
onClick={() => {
if (connectionRestored && !tonConnectUI.connected) {
tonConnectUI.openModal();
}
}}
background="#0098EA">
Connect Wallet
</AppButton>
Expand Down
Loading
Loading