Merge branch 'main' into alpha

.changeset/nervous-guests-sort.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/service-utils": patch
+---
+
+fix checkout service name

.changeset/rude-candles-stare.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/react-native": patch
+---
+
+Correctly pass sdkOptions down

.changeset/two-geckos-refuse.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/react-native": patch
+---
+
+Update WalletConnectUI to use new arch

.changeset/unlucky-horses-sort.md

@@ -0,0 +1,6 @@
+---
+"eslint-config-thirdweb": patch
+"@thirdweb-dev/react": patch
+---
+
+Enforce react-hooks/exhaustive-deps lint rule

.github/workflows/snippets.yml

@@ -0,0 +1,43 @@
+# On the Version Packages branch created by github-actions[bot]
+# Run `pnpm build`, `pnpm generate-docs` and `pnpm generate-snippets` to generate JSON files in the snippets folder
+# Commit the generated JSON files to the Version Packages branch
+
+name: Commit code snippets
+
+on:
+  push:
+    branches:
+      - changeset-release/main
+
+jobs:
+  typedoc:
+    if: github.actor == 'github-actions[bot]'
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install
+        uses: ./.github/composite-actions/install
+
+      - name: build
+        run: pnpm build
+
+      - name: generate-docs
+        run: pnpm generate-docs
+
+      - name: generate-snippets
+        run: pnpm generate-snippets
+
+      - name: Commit changes
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git add -A
+          git commit -m "snippets: update JSON files [skip ci]"
+          git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/typedoc.yml

@@ -0,0 +1,37 @@
+# On the Version Packages branch created by github-actions[bot]
+# Run `pnpm typedoc` to generate the JSON files
+# Commit the generated JSON files to the Version Packages branch
+
+name: Commit Typedoc JSON files
+
+on:
+  push:
+    branches:
+      - changeset-release/main
+
+jobs:
+  typedoc:
+    if: github.actor == 'github-actions[bot]'
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install
+        uses: ./.github/composite-actions/install
+
+      - name: Typedoc
+        run: pnpm typedoc
+
+      - name: Commit changes
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git add -A
+          git commit -m "typedoc: update JSON files [skip ci]"
+          git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -20,6 +20,4 @@ playwright-report/
 .env/
 
 # Artifacts
-packages/cli/artifacts/
-
-typedoc
+packages/cli/artifacts/

package.json

@@ -15,6 +15,8 @@
     "e2e": "turbo run e2e",
     "build": "turbo run build --filter=./packages/*",
     "typedoc": "turbo run typedoc",
+    "generate-docs": "turbo run generate-docs",
+    "generate-snippets": "node ./scripts/generate-snippets/index.mjs",
     "build:release": "turbo run build --force --filter=./packages/*",
     "dev": "turbo run dev --no-cache --parallel --continue",
     "fix:repo": "manypkg fix",

packages/eslint-config-thirdweb/index.js

@@ -50,5 +50,8 @@ module.exports = {
         ],
       },
     ],
+
+    // react
+    "react-hooks/exhaustive-deps": "error",
   },
 };

packages/react-core/package.json

@@ -48,7 +48,7 @@
     "lint": "eslint src/ && bunx publint --strict --level warning",
     "fix": "eslint src/ --fix",
     "clean": "rm -rf dist/",
-    "generate-docs": "pnpm generate-docs:evm && pnpm generate-snippets",
+    "generate-docs": "mkdir -p etc && pnpm generate-docs:evm && pnpm generate-snippets",
     "generate-docs:evm": "api-extractor run --local --config ./config/api-extractor-evm.json && api-documenter markdown -i ./temp -o ./docs/evm && rm -rf ./temp-evm && mv ./temp ./temp-evm",
     "generate-snippets": "node ./scripts/generate-snippets-evm.mjs && node ./scripts/generate-feature-snippets-evm.mjs",
     "build": "tsc && preconstruct build",

packages/react-core/scripts/typedoc.mjs

@@ -10,5 +10,4 @@ typedoc({
     "**/packages/wallets/**",
     "**/packages/chains/**",
   ],
-  output: "both", // TODO: change this to 'json' when old portal is fully migrated to new portal
 });

packages/react-native/scripts/typedoc.mjs

@@ -9,5 +9,4 @@ typedoc({
     "**/packages/react-core/**",
     "**/packages/chains/**",
   ],
-  output: "both", // TODO: change this to 'json' when old portal is fully migrated to new portal
 });

packages/react-native/src/evm/components/ConnectWalletFlow/ChooseWallet/ChooseWallet.tsx

@@ -191,7 +191,6 @@ export function ChooseWallet({
             onChooseWallet(emailWallet, data);
           }}
           walletConfig={emailWallet}
-          // TEMPORARY BUILD FIX
           connect={(options: any) => connect(emailWallet, options)}
           connectedWallet={activeWallet}
           connectedWalletAddress={address}

packages/react-native/src/evm/components/ConnectWalletFlow/ChooseWallet/ChooseWalletContent.tsx

@@ -60,7 +60,6 @@ export const ChooseWalletContent = ({
                       onChooseWallet(item, data);
                     }}
                     walletConfig={item}
-                    // TEMPORARY BUILD FIX
                     connect={(options: any) => connect(item, options)}
                     connectedWallet={activeWallet}
                     connectedWalletAddress={address}

packages/react-native/src/evm/index.ts

@@ -44,7 +44,7 @@ export {
   type ActionFn,
 } from "./components/Web3Button";
 
-export { WalletConnectUI } from "./wallets/wallets/wallet-connect/WalletConnectUI";
+export { WalletConnectUI } from "./wallets/wallets/wallet-connect/wallet-connect";
 
 // utilities
 export * from "./utils/uri";

packages/react-native/src/evm/providers/thirdweb-provider.tsx

@@ -183,7 +183,7 @@ export const ThirdwebProvider = <TChains extends Chain[] = DefaultChains>(
       }
       createWalletStorage={createWalletStorage}
       clientId={clientId}
-      {...sdkOptions}
+      sdkOptions={sdkOptions}
       {...restProps}
     >
       <ThemeProvider theme={theme ? theme : "dark"}>

packages/react-native/src/evm/wallets/wallets/wallet-connect/WalletConnectUI.tsx → packages/react-native/src/evm/wallets/wallets/wallet-connect/WalletConnectInnerUI.tsx

@@ -33,7 +33,7 @@ type WCWallet = {
 const DEVICE_WIDTH = Dimensions.get("window").width;
 const MODAL_HEIGHT = Dimensions.get("window").height * 0.5;
 
-export function WalletConnectUI({
+export function WalletConnectInnerUI({
   connected,
   projectId,
   goBack,

packages/react-native/src/evm/wallets/wallets/wallet-connect/wallet-connect.tsx

@@ -1,6 +1,16 @@
-import { WalletConfig, WalletOptions } from "@thirdweb-dev/react-core";
+import {
+  WalletConfig,
+  WalletOptions,
+  useAddress,
+  useConnect,
+  useConnectionStatus,
+  useCreateWalletInstance,
+  useSetConnectedWallet,
+  useSetConnectionStatus,
+  useWallet,
+} from "@thirdweb-dev/react-core";
 import { WalletConnect } from "./WalletConnect";
-import { WalletConnectUI } from "./WalletConnectUI";
+import { WalletConnectInnerUI } from "./WalletConnectInnerUI";
 import { TW_WC_PROJECT_ID } from "../../../constants/walletConnect";
 import { walletIds } from "@thirdweb-dev/wallets";
 
@@ -39,8 +49,65 @@ export const walletConnect = (
         projectId,
       }),
     connectUI(props) {
-      return <WalletConnectUI {...props} projectId={projectId} />;
+      return <WalletConnectInnerUI {...props} projectId={projectId} />;
     },
     recommended: config?.recommended,
   };
 };
+
+export type WalletConnectUIProps = {
+  /**
+   * temporarily hide the ConnectModal
+   * This is useful when you want to open another modal and do not want to show the ConnectModal in the background
+   */
+  hide: () => void;
+
+  /**
+   * when the wallet is connected, call this function to indicate that the wallet is connected and it is safe to close the Modal
+   */
+  connected: () => void;
+
+  /**
+   * go back to the wallet selector screen in connect wallet modal
+   */
+  goBack: () => void;
+
+  /**
+   * `WalletConfig` object of the wallet
+   */
+  walletConfig: WalletConfig<WalletConnect>;
+
+  /**
+   * Array of supported wallets including this wallet.
+   */
+  supportedWallets: WalletConfig[];
+
+  projectId: string;
+
+  isVisible?: boolean;
+};
+
+export const WalletConnectUI = (props: WalletConnectUIProps) => {
+  const connect = useConnect();
+  const connectionStatus = useConnectionStatus();
+  const createWalletInstance = useCreateWalletInstance();
+  const setConnectionStatus = useSetConnectionStatus();
+  const setConnectedWallet = useSetConnectedWallet();
+  const connectedWallet = useWallet();
+  const address = useAddress();
+
+  return (
+    <WalletConnectInnerUI
+      {...props}
+      setConnectionStatus={setConnectionStatus}
+      setConnectedWallet={setConnectedWallet}
+      projectId={props.projectId}
+      isVisible={props.isVisible}
+      connect={(connectProps) => connect(props.walletConfig, connectProps)}
+      connectionStatus={connectionStatus}
+      createWalletInstance={() => createWalletInstance(props.walletConfig)}
+      connectedWallet={connectedWallet as WalletConnect}
+      connectedWalletAddress={address}
+    />
+  );
+};

packages/react/package.json

@@ -63,7 +63,7 @@
     "lint": "eslint src/ && bunx publint --strict --level warning",
     "fix": "eslint src/ --fix",
     "clean": "rm -rf dist/",
-    "generate-docs": "pnpm generate-docs:evm && pnpm generate-snippets",
+    "generate-docs": "mkdir -p etc && pnpm generate-docs:evm && pnpm generate-snippets",
     "generate-docs:evm": "api-extractor run --local --config ./config/api-extractor-evm.json && api-documenter markdown -i ./temp -o ./docs/evm && rm -rf ./temp-evm && mv ./temp ./temp-evm",
     "generate-snippets": "node ./scripts/generate-snippets-evm.mjs && node ./scripts/generate-feature-snippets-evm.mjs",
     "build": "tsc && preconstruct build",

packages/react/scripts/typedoc.mjs

@@ -11,5 +11,4 @@ typedoc({
     "**/packages/react-core/**",
     "**/packages/chains/**",
   ],
-  output: "both", // TODO: change this to 'json' when old portal is fully migrated to new portal
 });

packages/react/src/payments/components/CheckoutWithCard.tsx

@@ -97,7 +97,20 @@ export const CheckoutWithCard = ({
       options,
       configs,
     });
-  }, [CheckoutWithCardIframeContainerRef.current]);
+  }, [
+    appNameToUse,
+    clientId,
+    configs,
+    locale,
+    onBeforeModalOpen,
+    onCardDetailLoad,
+    onError,
+    onPaymentSuccess,
+    onPriceUpdate,
+    onReview,
+    options,
+    sdkClientSecret,
+  ]);
 
   return (
     <>

packages/react/src/payments/components/PaperCheckout.tsx

@@ -141,7 +141,7 @@ export const PaperCheckout = <T extends ContractType>({
     return () => {
       window.removeEventListener("message", handleMessage);
     };
-  }, []);
+  }, [onCloseCheckout, onPaymentSuccess, onTransferSuccess]);
 
   // Build iframe URL with query params.
   const checkoutUrl = new URL(`/checkout/${checkoutId}`, PAPER_APP_URL);

packages/react/src/payments/components/VerifyOwnershipWithPaper.tsx

@@ -84,7 +84,7 @@ export const VerifyOwnershipWithPaper: React.FC<
     return () => {
       window.removeEventListener("message", handleMessage);
     };
-  }, []);
+  }, [onError, onSuccess, onWindowClose]);
 
   const url = new URL("/sdk/v1/login-with-paper", PAPER_APP_URL);
   url.searchParams.append("chainName", chainNameToUse);

packages/react/src/payments/components/common/Modal.tsx

@@ -36,7 +36,7 @@ export const Modal: React.FC<{
     return () => {
       document.removeEventListener("keydown", keyDownHandler);
     };
-  }, []);
+  }, [escapeToClose, onClose]);
 
   const additionalDialogClasses = isFullScreen ? "" : dialogContainedClasses;
   const dialogPanelBg = isFullScreen ? "transparent" : bgColor;

packages/sdk/package.json

@@ -64,7 +64,7 @@
     "lint": "eslint src/",
     "fix": "eslint src/ --fix",
     "clean": "rm -rf dist/",
-    "generate-docs": "pnpm generate-docs:evm && pnpm generate-snippets",
+    "generate-docs": "mkdir -p etc && pnpm generate-docs:evm && pnpm generate-snippets",
     "generate-docs:evm": "api-extractor run --local --config ./config/api-extractor-evm.json && api-documenter markdown -i ./temp -o ./docs/evm && rm -rf ./temp-evm && mv ./temp ./temp-evm",
     "generate-snippets": "node ./scripts/generate-snippets.mjs && node ./scripts/generate-feature-snippets-evm.mjs",
     "build": "tsc && preconstruct build",

packages/sdk/scripts/typedoc.mjs

@@ -6,5 +6,4 @@ import { typedoc } from "typedoc-gen";
 typedoc({
   entryPoints: ["src/index.ts"],
   exclude: ["**/packages/storage/**", "**/packages/chains/**"],
-  output: "both", // TODO: change this to 'json' when old portal is fully migrated to new portal
 });

packages/service-utils/src/core/services.ts

@@ -44,7 +44,7 @@ export const SERVICE_DEFINITIONS = {
     // all actions allowed
     actions: [],
   },
-  payments: {
+  checkout: {
     name: "checkout",
     title: "Checkouts",
     description: "Payments for easy web3 onboarding",

packages/storage/package.json

@@ -18,7 +18,6 @@
     "format": "prettier --write 'src/**/*'",
     "lint": "eslint src/ && bunx publint --strict --level warning",
     "fix": "eslint src/ --fix",
-    "generate-docs": "api-extractor run --local && api-documenter markdown -i ./temp -o ./docs",
     "clean": "rm -rf dist/",
     "build": "tsc && preconstruct build",
     "test:all": "NODE_ENV=test SWC_NODE_PROJECT=./tsconfig.test.json mocha --timeout 30000 --parallel './test/**/*.test.ts'",

packages/storage/scripts/typedoc.mjs

@@ -4,5 +4,4 @@ import { typedoc } from "typedoc-gen";
 typedoc({
   entryPoints: ["src/index.ts"],
   exclude: [],
-  output: "both", // TODO: change this to 'json' when old portal is fully migrated to new portal
 });