@multiplatform.one/web3 7.90.1 → 7.90.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/web3",
-  "version": "7.90.1",
+  "version": "7.90.2",
   "description": "Web3 wallet integration for multiplatform.one ecosystem with ConnectKit and wagmi",
   "keywords": [
     "connectkit",
@@ -120,10 +120,10 @@
     "@aave/account": "^0.2.1",
     "@coinbase/wallet-sdk": "^4.4.0",
     "@metamask/connect-evm": "^2.1.1",
-    "@multiplatform.one/connectkit": "^7.90.1",
-    "@multiplatform.one/gpg": "^7.90.1",
-    "@multiplatform.one/platform": "^7.90.1",
-    "@multiplatform.one/theme": "^7.90.1",
+    "@multiplatform.one/connectkit": "^7.90.2",
+    "@multiplatform.one/gpg": "^7.90.2",
+    "@multiplatform.one/platform": "^7.90.2",
+    "@multiplatform.one/theme": "^7.90.2",
     "@noble/ciphers": "^1.3.0",
     "@noble/curves": "^1.9.7",
     "@phosphor-icons/react": "^2.1.10",
@@ -147,8 +147,8 @@
     "wagmi": "^3.7.1"
   },
   "devDependencies": {
-    "@multiplatform.one/config": "7.90.1",
-    "@multiplatform.one/test-utils": "7.90.1",
+    "@multiplatform.one/config": "7.90.2",
+    "@multiplatform.one/test-utils": "7.90.2",
     "@tamagui/build": "2.7.6",
     "@tanstack/react-query": "^5.104.3",
     "@testing-library/jest-dom": "^7.0.1",

package/src/connectkit/components/ConnectModal/ConnectWithInjector/index.spec.tsx

@@ -0,0 +1,104 @@
+// @vitest-environment happy-dom
+import React, { useState } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { act, cleanup, render } from "@testing-library/react";
+import { ConnectKitThemeProvider, Context } from "@multiplatform.one/connectkit";
+
+import ConnectWithInjector from ".";
+
+type Mutation = {
+  onSettled?: (data?: unknown, error?: unknown) => void;
+};
+
+const captured: { mutation?: Mutation } = {};
+
+vi.mock("../../../hooks/useConnect", () => ({
+  useConnect: ({ mutation }: { mutation: Mutation }) => {
+    captured.mutation = mutation;
+    return { connect: vi.fn() };
+  },
+}));
+
+vi.mock("../../../wallets/useWallets", () => ({
+  useWallet: () => ({
+    id: "mock",
+    name: "Mock Wallet",
+    connector: { id: "mock", uid: "mock-uid" },
+    isInstalled: false,
+  }),
+}));
+
+function Harness({ onResize }: { onResize: () => void }) {
+  const [, setResize] = useState(0);
+  const value = {
+    connector: { id: "mock" },
+    options: {},
+    log: () => {},
+    triggerResize: () => {
+      onResize();
+      setResize((prev) => prev + 1);
+    },
+  } as unknown as React.ContextType<typeof Context>;
+  return (
+    <Context.Provider value={value}>
+      <ConnectKitThemeProvider>
+        <ConnectWithInjector />
+      </ConnectKitThemeProvider>
+    </Context.Provider>
+  );
+}
+
+describe("ConnectWithInjector", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    cleanup();
+    vi.unstubAllGlobals();
+    vi.useRealTimers();
+    captured.mutation = undefined;
+  });
+
+  it("drops its pending timers when it unmounts", () => {
+    const onResize = vi.fn();
+    const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
+    const { unmount } = render(<Harness onResize={onResize} />);
+
+    act(() => {
+      captured.mutation?.onSettled?.(undefined, { code: 4001 });
+    });
+    unmount();
+    vi.stubGlobal("window", undefined);
+
+    expect(() => vi.advanceTimersByTime(5000)).not.toThrow();
+    expect(onResize).not.toHaveBeenCalled();
+    expect(consoleError).not.toHaveBeenCalled();
+  });
+
+  it("schedules nothing when the connect settles after unmount", () => {
+    const onResize = vi.fn();
+    const { unmount } = render(<Harness onResize={onResize} />);
+
+    unmount();
+    captured.mutation?.onSettled?.(undefined, { code: 4001 });
+    vi.stubGlobal("window", undefined);
+
+    expect(() => vi.advanceTimersByTime(5000)).not.toThrow();
+    expect(onResize).not.toHaveBeenCalled();
+  });
+
+  it("still resizes while mounted", () => {
+    const onResize = vi.fn();
+    render(<Harness onResize={onResize} />);
+
+    act(() => {
+      captured.mutation?.onSettled?.(undefined, { code: 4001 });
+    });
+    act(() => {
+      vi.advanceTimersByTime(100);
+    });
+
+    expect(onResize).toHaveBeenCalledTimes(1);
+  });
+});

package/src/connectkit/components/ConnectModal/ConnectWithInjector/index.tsx

@@ -1,5 +1,5 @@
 import { motionSeconds } from "@multiplatform.one/theme/motion";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { AnimatePresence, Variants } from "framer-motion";
 import {
   Container,
@@ -83,6 +83,18 @@ const contentVariants: Variants = {
 const ConnectWithInjector: React.FC<{
   forceState?: typeof states;
 }> = ({ forceState }) => {
+  const timers = useRef<ReturnType<typeof setTimeout>[] | null>([]);
+  useEffect(() => {
+    timers.current = [];
+    return () => {
+      timers.current?.forEach(clearTimeout);
+      timers.current = null;
+    };
+  }, []);
+  const schedule = (fn: () => void, ms: number) => {
+    timers.current?.push(setTimeout(fn, ms));
+  };
+
   const { connect } = useConnect({
     mutation: {
       onMutate: (connector?: any) => {
@@ -98,7 +110,7 @@ const ConnectWithInjector: React.FC<{
       onSettled(data?: any, error?: any) {
         if (error) {
           setShowTryAgainTooltip(true);
-          setTimeout(() => setShowTryAgainTooltip(false), 3500);
+          schedule(() => setShowTryAgainTooltip(false), 3500);
           if (error.code) {
             // https://github.com/MetaMask/eth-rpc-errors/blob/main/src/error-constants.ts
             switch (error.code) {
@@ -127,7 +139,7 @@ const ConnectWithInjector: React.FC<{
           }
         } else if (data) {
         }
-        setTimeout(triggerResize, 100);
+        schedule(triggerResize, 100);
       },
     },
   });

package/types/connectkit/components/ConnectModal/ConnectWithInjector/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/connectkit/components/ConnectModal/ConnectWithInjector/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;AA0CnD,eAAO,MAAM,MAAM;;;;;;;;CAQlB,CAAC;AA+BF,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC;IAClC,UAAU,CAAC,EAAE,OAAO,MAAM,CAAC;CAC5B,CAwbA,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/connectkit/components/ConnectModal/ConnectWithInjector/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsC,MAAM,OAAO,CAAC;AA0C3D,eAAO,MAAM,MAAM;;;;;;;;CAQlB,CAAC;AA+BF,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC;IAClC,UAAU,CAAC,EAAE,OAAO,MAAM,CAAC;CAC5B,CAocA,CAAC;AAEF,eAAe,mBAAmB,CAAC"}