thirdweb 5.79.0 → 5.80.0-nightly-3d6e2a2b8bcec1c11de51c218a39cb1116dd7f22-20241220000331

package/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.test.tsx

@@ -0,0 +1,64 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render, screen } from "../../../../../../test/src/react-render.js";
+import { TEST_CLIENT } from "../../../../../../test/src/test-clients.js";
+import { createWallet } from "../../../../../wallets/create-wallet.js";
+import { useAdminWallet } from "../../../../core/hooks/wallets/useAdminWallet.js";
+import en from "../locale/en.js";
+import { ManageWalletScreen } from "./ManageWalletScreen.js";
+
+vi.mock("../../../../core/hooks/wallets/useAdminWallet");
+
+describe("ManageWalletScreen", () => {
+  const mockProps = {
+    onBack: vi.fn(),
+    setScreen: vi.fn(),
+    closeModal: vi.fn(),
+    locale: en,
+    client: TEST_CLIENT,
+  };
+
+  beforeEach(() => {
+    vi.mocked(useAdminWallet).mockReturnValue(createWallet("inApp"));
+  });
+
+  it("should render the modal header with the correct title", () => {
+    render(<ManageWalletScreen {...mockProps} />);
+    expect(screen.getByText(en.manageWallet.title)).toBeInTheDocument();
+  });
+
+  it("should render the linked profiles button if allowLinkingProfiles is true", () => {
+    render(
+      <ManageWalletScreen
+        {...mockProps}
+        manageWallet={{ allowLinkingProfiles: true }}
+      />,
+    );
+    expect(
+      screen.getByText(en.manageWallet.linkedProfiles),
+    ).toBeInTheDocument();
+  });
+
+  it("should not render the linked profiles button if allowLinkingProfiles is false", () => {
+    render(
+      <ManageWalletScreen
+        {...mockProps}
+        manageWallet={{ allowLinkingProfiles: false }}
+      />,
+    );
+    expect(
+      screen.queryByText(en.manageWallet.linkedProfiles),
+    ).not.toBeInTheDocument();
+  });
+
+  it("should default to showing linked profiles button", () => {
+    render(<ManageWalletScreen {...mockProps} />);
+    expect(
+      screen.getByText(en.manageWallet.linkedProfiles),
+    ).toBeInTheDocument();
+  });
+
+  it("should render the wallet connect receiver button", () => {
+    render(<ManageWalletScreen {...mockProps} />);
+    expect(screen.getByText(en.manageWallet.connectAnApp)).toBeInTheDocument();
+  });
+});

package/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx

@@ -1,10 +1,10 @@
 "use client";
 import { ShuffleIcon } from "@radix-ui/react-icons";
 import type { ThirdwebClient } from "../../../../../client/client.js";
-import { isEcosystemWallet } from "../../../../../wallets/ecosystem/is-ecosystem-wallet.js";
 import { isInAppWallet } from "../../../../../wallets/in-app/core/wallet/index.js";
 import { injectedProvider } from "../../../../../wallets/injected/mipdStore.js";
 import { fontSize, iconSize } from "../../../../core/design-system/index.js";
+import type { ConnectButton_detailsModalOptions } from "../../../../core/hooks/connection/ConnectButtonProps.js";
 import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
 import { useAdminWallet } from "../../../../core/hooks/wallets/useAdminWallet.js";
 import { Spacer } from "../../components/Spacer.js";
@@ -26,6 +26,7 @@ export function ManageWalletScreen(props: {
   closeModal: () => void;
   locale: ConnectLocale;
   client: ThirdwebClient;
+  manageWallet?: ConnectButton_detailsModalOptions["manageWallet"];
 }) {
   const activeWallet = useAdminWallet();
 
@@ -57,10 +58,9 @@ export function ManageWalletScreen(props: {
             connectLocale={props.locale}
           />
 
-          {/* Multi-auth */}
-          {activeWallet &&
-            (activeWallet?.id === "inApp" ||
-              isEcosystemWallet(activeWallet)) && (
+          {/* Unified Identity */}
+          {typeof activeWallet !== "undefined" &&
+            props.manageWallet?.allowLinkingProfiles !== false && (
               <MenuButton
                 onClick={() => {
                   props.setScreen("linked-profiles");

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.79.0";
+export const version = "5.80.0-nightly-3d6e2a2b8bcec1c11de51c218a39cb1116dd7f22-20241220000331";

package/src/wallets/in-app/web/in-app.ts

@@ -29,6 +29,26 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  *
  * [View all available social auth methods](https://portal.thirdweb.com/connect/wallet/sign-in-methods/configure)
  *
+ * ### Enable smart accounts and sponsor gas for your users:
+ *
+ * ```ts
+ * import { inAppWallet } from "thirdweb/wallets";
+ * import { sepolia } from "thirdweb/chains";
+ *
+ * const wallet = inAppWallet({
+ *  smartAccount: {
+ *   chain: sepolia,
+ *   sponsorGas: true,
+ * },
+ * });
+ *
+ * // account will be a smart account with sponsored gas enabled
+ * const account = await wallet.connect({
+ *   client,
+ *   strategy: "google",
+ * });
+ * ```
+ *
  * ### Login with email
  *
  * ```ts
@@ -107,27 +127,38 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  * });
  * ```
  *
- * ### Enable smart accounts and sponsor gas for your users:
- *
+ * ### Connect to a guest account
  * ```ts
  * import { inAppWallet } from "thirdweb/wallets";
- * import { sepolia } from "thirdweb/chains";
  *
- * const wallet = inAppWallet({
- *  smartAccount: {
- *   chain: sepolia,
- *   sponsorGas: true,
- * },
+ * const wallet = inAppWallet();
+ *
+ * const account = await wallet.connect({
+ *   client,
+ *   strategy: "guest",
  * });
+ * ```
+ *
+ * ### Connect with custom JWT (any OIDC provider)
+ *
+ * You can use any OIDC provider to authenticate your users. Make sure to configure it in your dashboard under in-app wallet settings.
+ *
+ * ```ts
+ * import { inAppWallet } from "thirdweb/wallets";
+ *
+ * const wallet = inAppWallet();
  *
- * // account will be a smart account with sponsored gas enabled
  * const account = await wallet.connect({
  *   client,
- *   strategy: "google",
+ *   strategy: "jwt",
+ *   jwt: "your_jwt_here",
  * });
  * ```
  *
- * ### Connect to a guest account
+ * ### Connect with custom endpoint
+ *
+ * You can also use your own endpoint to authenticate your users. Make sure to configure it in your dashboard under in-app wallet settings.
+ *
  * ```ts
  * import { inAppWallet } from "thirdweb/wallets";
  *
@@ -135,7 +166,8 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  *
  * const account = await wallet.connect({
  *   client,
- *   strategy: "guest",
+ *   strategy: "auth_endpoint",
+ *   payload: "your_auth_payload_here",
  * });
  * ```
  *

package/src/wallets/smart/smart-wallet-dev.test.ts

@@ -1,6 +1,6 @@
 import { beforeAll, describe, expect, it } from "vitest";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
-import { arbitrumSepolia } from "../../chains/chain-definitions/arbitrum.js";
+import { arbitrumSepolia } from "../../chains/chain-definitions/arbitrum-sepolia.js";
 import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { balanceOf } from "../../extensions/erc1155/__generated__/IERC1155/read/balanceOf.js";
 import { claimTo } from "../../extensions/erc1155/drops/write/claimTo.js";
@@ -14,6 +14,7 @@ import type { Account, Wallet } from "../interfaces/wallet.js";
 import { generateAccount } from "../utils/generateAccount.js";
 import { smartWallet } from "./smart-wallet.js";
 let wallet: Wallet;
+
 let smartAccount: Account;
 let smartWalletAddress: Address;
 let personalAccount: Account;