thirdweb 5.32.2 → 5.33.0

package/src/react/web/ui/ConnectWallet/WalletSelector.tsx

@@ -17,6 +17,7 @@ import {
   spacing,
 } from "../../../core/design-system/index.js";
 import { genericWalletIcon } from "../../../core/utils/socialIcons.js";
+import { useSetSelectionData } from "../../providers/wallet-ui-states-provider.js";
 import { sortWallets } from "../../utils/sortWallets.js";
 import { LoadingScreen } from "../../wallets/shared/LoadingScreen.js";
 import { Img } from "../components/Img.js";
@@ -580,7 +581,7 @@ const WalletSelection: React.FC<{
 }> = (props) => {
   const wallets = sortWallets(props.wallets, props.recommendedWallets);
   const { screen } = useScreenContext();
-
+  const setSelectionData = useSetSelectionData();
   return (
     <WalletList
       style={{
@@ -614,6 +615,7 @@ const WalletSelection: React.FC<{
               <WalletEntryButton
                 walletId={wallet.id}
                 selectWallet={() => {
+                  setSelectionData({});
                   props.selectWallet(wallet);
                 }}
                 connectLocale={props.connectLocale}

package/src/react/web/ui/MediaRenderer/MediaRenderer.tsx

@@ -60,16 +60,14 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
         height = "300px",
         style,
         mimeType,
-        ...restProps
+        client,
+        controls,
+        className,
       },
       ref,
     ) {
-      const client = restProps.client;
-
       const mergedStyle: React.CSSProperties = {
         objectFit: "contain",
-        width,
-        height,
         ...style,
       };
 
@@ -99,8 +97,10 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
               style={mergedStyle}
               src={mediaInfo.url}
               poster={possiblePosterSrc.url}
+              ref={ref as unknown as React.ForwardedRef<HTMLIFrameElement>}
               requireInteraction={requireInteraction}
-              {...restProps}
+              className={className}
+              alt={alt}
             />
           );
         }
@@ -111,13 +111,12 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
             <Suspense
               fallback={
                 poster ? (
-                  // biome-ignore lint/a11y/useAltText: alt is there
                   <img
                     style={mergedStyle}
                     src={poster}
                     alt={alt}
                     ref={ref as unknown as React.LegacyRef<HTMLImageElement>}
-                    {...restProps}
+                    className={className}
                   />
                 ) : null
               }
@@ -127,7 +126,7 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
                 src={mediaInfo.url || ""}
                 poster={poster}
                 alt={alt}
-                {...restProps}
+                className={className}
               />
             </Suspense>
           );
@@ -139,9 +138,11 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
             <VideoPlayer
               style={mergedStyle}
               src={mediaInfo.url}
+              ref={ref as unknown as React.ForwardedRef<HTMLVideoElement>}
               poster={possiblePosterSrc.url}
               requireInteraction={requireInteraction}
-              {...restProps}
+              className={className}
+              controls={controls}
             />
           );
         }
@@ -153,8 +154,12 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
               style={mergedStyle}
               src={mediaInfo.url}
               poster={possiblePosterSrc.url}
-              requireInteraction={requireInteraction}
-              {...restProps}
+              alt={alt}
+              ref={ref as unknown as React.ForwardedRef<HTMLAudioElement>}
+              className={className}
+              height={height}
+              width={width}
+              controls={controls}
             />
           );
         }
@@ -167,7 +172,9 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
               src={mediaInfo.url}
               alt={alt}
               ref={ref as unknown as React.ForwardedRef<HTMLImageElement>}
-              {...restProps}
+              className={className}
+              height={height}
+              width={width}
             />
           );
         }
@@ -180,7 +187,7 @@ export const MediaRenderer = /* @__PURE__ */ (() =>
           src={mediaInfo.url}
           alt={alt}
           ref={ref as unknown as React.Ref<HTMLAnchorElement>}
-          {...restProps}
+          className={className}
         />
       );
     },
@@ -242,41 +249,60 @@ const PlayButton: React.FC<PlayButtonProps> = ({ onClick, isPlaying }) => {
 };
 
 const ImageRenderer = /* @__PURE__ */ (() =>
-  React.forwardRef<HTMLImageElement, MediaRendererProps>(
-    function Image_Renderer(props, ref) {
-      const { style, src, alt, ...restProps } = props;
-      const [error, setError] = useState(false);
-
-      if (error) {
-        return (
-          <LinkPlayer
-            style={style}
-            src={src}
-            alt={alt}
-            ref={ref as unknown as React.Ref<HTMLAnchorElement>}
-            {...restProps}
-          />
-        );
-      }
+  React.forwardRef<
+    HTMLImageElement,
+    Pick<
+      MediaRendererProps,
+      "src" | "style" | "alt" | "className" | "height" | "width"
+    >
+  >(function Image_Renderer(props, ref) {
+    const { style, src, alt, className, height, width } = props;
+    const [error, setError] = useState(false);
 
+    if (error) {
       return (
-        // biome-ignore lint/a11y/useAltText: we do set the alt text
-        <img
+        <LinkPlayer
           style={style}
-          src={src ?? undefined}
+          src={src}
           alt={alt}
-          ref={ref}
-          {...restProps}
-          onError={() => {
-            setError(true);
-          }}
+          ref={ref as unknown as React.Ref<HTMLAnchorElement>}
+          className={className}
         />
       );
-    },
-  ))();
+    }
+
+    return (
+      <img
+        style={style}
+        src={src ?? undefined}
+        alt={alt}
+        ref={ref}
+        className={className}
+        height={height}
+        width={width}
+        onError={() => {
+          setError(true);
+        }}
+      />
+    );
+  }))();
 
 const VideoPlayer = /* @__PURE__ */ (() =>
-  React.forwardRef<HTMLVideoElement, MediaRendererProps>(function Video_Player(
+  React.forwardRef<
+    HTMLVideoElement,
+    Pick<
+      MediaRendererProps,
+      | "alt"
+      | "src"
+      | "poster"
+      | "requireInteraction"
+      | "style"
+      | "width"
+      | "height"
+      | "controls"
+      | "className"
+    >
+  >(function Video_Player(
     {
       src,
       alt,
@@ -286,7 +312,7 @@ const VideoPlayer = /* @__PURE__ */ (() =>
       width,
       height,
       controls,
-      ...restProps
+      className,
     },
     ref,
   ) {
@@ -321,13 +347,13 @@ const VideoPlayer = /* @__PURE__ */ (() =>
           src={src}
           alt={alt}
           ref={ref as unknown as React.Ref<HTMLAnchorElement>}
-          {...restProps}
+          className={className}
         />
       );
     }
 
     return (
-      <div style={{ position: "relative", ...style }} {...restProps}>
+      <div style={{ position: "relative", ...style }} className={className}>
         <video
           ref={mergeRefs([videoRef, ref])}
           src={src ?? undefined}
@@ -389,18 +415,21 @@ const VideoPlayer = /* @__PURE__ */ (() =>
   }))();
 
 const AudioPlayer = /* @__PURE__ */ (() =>
-  React.forwardRef<HTMLAudioElement, MediaRendererProps>(function Audio_Player(
-    {
-      src,
-      alt,
-      poster,
-      style,
-      height,
-      width,
-
-      requireInteraction,
-      ...restProps
-    },
+  React.forwardRef<
+    HTMLAudioElement,
+    Pick<
+      MediaRendererProps,
+      | "src"
+      | "alt"
+      | "poster"
+      | "style"
+      | "height"
+      | "width"
+      | "className"
+      | "controls"
+    >
+  >(function Audio_Player(
+    { src, alt, poster, style, height, width, className, controls },
     ref,
   ) {
     const audioRef = useRef<HTMLAudioElement>(null);
@@ -426,13 +455,13 @@ const AudioPlayer = /* @__PURE__ */ (() =>
           src={src}
           alt={alt}
           ref={ref as unknown as React.Ref<HTMLAnchorElement>}
-          {...restProps}
+          className={className}
         />
       );
     }
 
     return (
-      <div style={{ position: "relative", ...style }} {...restProps}>
+      <div style={{ position: "relative", ...style }} className={className}>
         {poster ? (
           <img
             height={height}
@@ -474,6 +503,7 @@ const AudioPlayer = /* @__PURE__ */ (() =>
           src={src ?? undefined}
           loop
           playsInline
+          controls={controls}
           muted={muted}
           preload="none"
           controlsList="nodownload"
@@ -493,69 +523,79 @@ const AudioPlayer = /* @__PURE__ */ (() =>
   }))();
 
 const IframePlayer = /* @__PURE__ */ (() =>
-  React.forwardRef<HTMLIFrameElement, MediaRendererProps>(
-    function Iframe_Player(
-      { src, alt, poster, requireInteraction, style, ...restProps },
-      ref,
-    ) {
-      const [playing, setPlaying] = useState(!requireInteraction);
+  React.forwardRef<
+    HTMLIFrameElement,
+    Omit<
+      MediaRendererProps,
+      | "client"
+      | "gatewayUrl"
+      | "mimeType"
+      | "controls"
+      | "height"
+      | "width"
+      | "children"
+    >
+  >(function Iframe_Player(
+    { src, alt, poster, requireInteraction, style, ...restProps },
+    ref,
+  ) {
+    const [playing, setPlaying] = useState(!requireInteraction);
 
-      return (
-        <div style={{ position: "relative", ...style }} {...restProps}>
-          <iframe
-            title={alt || "thirdweb iframe player"}
-            src={playing ? src ?? undefined : undefined}
-            ref={ref}
+    return (
+      <div style={{ position: "relative", ...style }} {...restProps}>
+        <iframe
+          title={alt || "thirdweb iframe player"}
+          src={playing ? src ?? undefined : undefined}
+          ref={ref}
+          style={{
+            objectFit: "contain",
+            zIndex: 1,
+            height: "100%",
+            width: "100%",
+            transition: "opacity .5s",
+            opacity: !poster ? 1 : playing ? 1 : 0,
+            border: "none",
+          }}
+          sandbox="allow-scripts"
+          allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+        />
+        {poster && (
+          <img
+            src={poster}
             style={{
               objectFit: "contain",
-              zIndex: 1,
-              height: "100%",
+              pointerEvents: "none",
+              position: "absolute",
               width: "100%",
+              height: "100%",
+              zIndex: 2,
               transition: "opacity .5s",
-              opacity: !poster ? 1 : playing ? 1 : 0,
-              border: "none",
-            }}
-            sandbox="allow-scripts"
-            allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
-          />
-          {poster && (
-            <img
-              src={poster}
-              style={{
-                objectFit: "contain",
-                pointerEvents: "none",
-                position: "absolute",
-                width: "100%",
-                height: "100%",
-                zIndex: 2,
-                transition: "opacity .5s",
-                opacity: playing ? 0 : 1,
-                top: 0,
-                left: 0,
-                right: 0,
-                bottom: 0,
-              }}
-              alt={alt}
-            />
-          )}
-          <PlayButton
-            onClick={() => {
-              setPlaying((prev) => !prev);
+              opacity: playing ? 0 : 1,
+              top: 0,
+              left: 0,
+              right: 0,
+              bottom: 0,
             }}
-            isPlaying={playing}
+            alt={alt}
           />
-        </div>
-      );
-    },
-  ))();
+        )}
+        <PlayButton
+          onClick={() => {
+            setPlaying((prev) => !prev);
+          }}
+          isPlaying={playing}
+        />
+      </div>
+    );
+  }))();
 
 const LinkPlayer = /* @__PURE__ */ (() =>
-  React.forwardRef<HTMLAnchorElement, MediaRendererProps>(function Link_Player(
-    { src, alt, style, ...restProps },
-    ref,
-  ) {
+  React.forwardRef<
+    HTMLAnchorElement,
+    Pick<MediaRendererProps, "src" | "alt" | "style" | "className">
+  >(function Link_Player({ src, alt, style, className }, ref) {
     return (
-      <div style={{ position: "relative", ...style }} {...restProps}>
+      <div style={{ position: "relative", ...style }} className={className}>
         <div
           style={{
             width: "100%",

package/src/react/web/ui/MediaRenderer/ModelViewer.tsx

@@ -12,12 +12,12 @@ declare global {
 }
 
 export const ModelViewer = /* @__PURE__ */ (() =>
-  React.forwardRef<HTMLDivElement, MediaRendererProps>(function Model_Viewer(
-    { src, alt, poster, style },
-    ref,
-  ) {
+  React.forwardRef<
+    HTMLDivElement,
+    Pick<MediaRendererProps, "src" | "alt" | "poster" | "style" | "className">
+  >(function Model_Viewer({ src, alt, poster, style, className }, ref) {
     return (
-      <div style={{ ...style }} ref={ref}>
+      <div style={{ ...style }} className={className} ref={ref}>
         {src ? (
           <model-viewer
             src={src}

package/src/react/web/ui/MediaRenderer/types.ts

@@ -1,4 +1,3 @@
-import type { ReactNode } from "react";
 import type { ThirdwebClient } from "../../../../client/client.js";
 
 /**
@@ -88,8 +87,6 @@ export type MediaRendererProps = {
    */
   requireInteraction?: boolean;
 
-  children?: ReactNode;
-
   /**
    * Provide the [MIME type](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types) of the media if it is known
    */

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.32.2";
+export const version = "5.33.0";

package/src/wallets/coinbase/coinbaseWebSDK.ts

@@ -373,7 +373,7 @@ function onConnect(
     await provider.disconnect();
   }
 
-  function onDisconnect() {
+  async function onDisconnect() {
     disconnect();
     emitter.emit("disconnect", undefined);
   }
@@ -401,7 +401,7 @@ function onConnect(
   return [
     account,
     chain,
-    disconnect,
+    onDisconnect,
     (newChain) => switchChainCoinbaseWalletSDK(provider, newChain),
   ];
 }

package/src/wallets/injected/index.ts

@@ -228,7 +228,7 @@ async function onConnect(
     provider.removeListener("disconnect", onDisconnect);
   }
 
-  function onDisconnect() {
+  async function onDisconnect() {
     disconnect();
     emitter.emit("disconnect", undefined);
   }
@@ -258,7 +258,7 @@ async function onConnect(
   return [
     account,
     chain,
-    disconnect,
+    onDisconnect,
     (newChain) => switchChain(provider, newChain),
   ] as const;
 }

package/src/wallets/smart/index.ts

@@ -203,9 +203,6 @@ async function createSmartAccount(
       ]);
       const isDeployed = await isContractDeployed(accountContract);
       if (!isDeployed) {
-        console.log(
-          "Account contract not deployed yet. Deploying account before signing message",
-        );
         await _deployAccount({
           options,
           account,

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

@@ -1,7 +1,7 @@
 import { beforeAll, describe, expect, it } from "vitest";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { typedData } from "../../../test/src/typed-data.js";
-import { verifySignature } from "../../auth/verifySignature.js";
+import { verifySignature } from "../../auth/verify-signature.js";
 import { arbitrumSepolia } from "../../chains/chain-definitions/arbitrum-sepolia.js";
 import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { parseEventLogs } from "../../event/actions/parse-logs.js";

package/dist/cjs/auth/verifySignature.js

@@ -1,137 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyEOASignature = verifyEOASignature;
-exports.verifyContractWalletSignature = verifyContractWalletSignature;
-exports.verifySignature = verifySignature;
-const viem_1 = require("viem");
-const contract_js_1 = require("../contract/contract.js");
-const isValidSignature_js_1 = require("../extensions/erc1271/__generated__/isValidSignature/read/isValidSignature.js");
-const hex_js_1 = require("../utils/encoding/hex.js");
-const hashMessage_js_1 = require("../utils/hashing/hashMessage.js");
-/**
- * Verifies the signature of a message using an Ethereum account's EOA (Externally Owned Account).
- * @param options - The options for verifying the signature.
- * @returns A boolean indicating whether the signature is valid.
- * @throws An error if the signature is invalid.
- * @example
- * ```ts
- * import { verifyEOASignature } from 'thirdweb/auth';
- *
- * const isValid = await verifyEOASignature({
- *  message: '0x1234567890123456789012345678901234567890',
- *  signature: '0x1234567890123456789012345678901234567890',
- *  address: '0x1234567890123456789012345678901234567890',
- * });
- * ```
- * @auth
- */
-async function verifyEOASignature(options) {
-    const messageHash = (0, hashMessage_js_1.hashMessage)(options.message);
-    if (!(0, hex_js_1.isHex)(options.signature)) {
-        return false;
-    }
-    const recoveredAddress = await (0, viem_1.recoverAddress)({
-        hash: messageHash,
-        signature: options.signature,
-    });
-    if (recoveredAddress.toLowerCase() === options.address.toLowerCase()) {
-        return true;
-    }
-    return false;
-}
-const EIP1271_MAGICVALUE = "0x1626ba7e";
-/**
- * Verifies the signature of a contract wallet.
- * @param options - The parameters for verifying the signature.
- * @returns A boolean indicating whether the signature is valid.
- * @throws An error if the signature is invalid.
- * @example
- * ```ts
- * import { verifyContractWalletSignature } from 'thirdweb/auth';
- *
- * const isValid = await verifyContractWalletSignature({
- *  message: '0x1234567890123456789012345678901234567890',
- *  signature: '0x1234567890123456789012345678901234567890',
- *  address: '0x1234567890123456789012345678901234567890',
- *  chain: ...,
- *  client: ...,
- * });
- * ```
- * @auth
- */
-async function verifyContractWalletSignature(options) {
-    if (!(0, hex_js_1.isHex)(options.signature)) {
-        throw new Error("Invalid signature");
-    }
-    const contract = (0, contract_js_1.getContract)({
-        address: options.address,
-        chain: options.chain,
-        client: options.client,
-    });
-    const messageHash = (0, hashMessage_js_1.hashMessage)(options.message);
-    const result = await (0, isValidSignature_js_1.isValidSignature)({
-        contract,
-        hash: messageHash,
-        signature: options.signature,
-    });
-    return result === EIP1271_MAGICVALUE;
-}
-/**
- * Verifies the signature based on the provided options.
- * Handles smart contract wallet signatures and EOA signatures.
- * **IMPORTANT: in order to check smart contract signatures, a chain and client must be provided.**
- * @param options - The options for signature verification.
- * @returns A boolean indicating whether the signature is valid or not.
- * @example
- * ```ts
- * import { verifySignature } from 'thirdweb/auth';
- *
- * const isValid = await verifySignature({
- *  message: 'Your message to sign',
- *  signature: '0x91db0222ec371a8c18d3b187a6d2e77789bffca1b96826ef6b8708e0d4a66c80312fc3ae95b8fbc147265abf539bb6f360152be61a0e1411d7f5771a599e769a1c',
- *  address: '0xda9C7A86AeE76701FC1c23ae548e8E93Ba3e42A5',
- *  client: thirdwebClient,
- *  chain: chain
- * });
- * ```
- * @auth
- */
-let warningTriggered = false;
-async function verifySignature(options) {
-    try {
-        const isValidEOASig = await verifyEOASignature(options);
-        if (isValidEOASig) {
-            return true;
-        }
-    }
-    catch {
-        // no-op, we skip to contract signature check
-    }
-    if (isVerifyContractWalletSignatureParams(options)) {
-        try {
-            return await verifyContractWalletSignature(options);
-        }
-        catch {
-            // no-op we skip to return false
-        }
-    }
-    else if (!warningTriggered) {
-        // We only trigger this warning once
-        warningTriggered = true;
-        console.error(`
-      Failed to verify EOA signature and no chain or client provided.
-
-      If you mean to use a smart account, please provide a chain and client.
-      For more information on how to setup a smart account with Auth, see https://portal.thirdweb.com/connect/auth
-    `);
-    }
-    // if we reach here, we have no way to verify the signature
-    return false;
-}
-function isVerifyContractWalletSignatureParams(options) {
-    return ("chain" in options &&
-        options.chain !== undefined &&
-        "client" in options &&
-        options.client !== undefined);
-}
-//# sourceMappingURL=verifySignature.js.map

package/dist/cjs/auth/verifySignature.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"verifySignature.js","sourceRoot":"","sources":["../../../src/auth/verifySignature.ts"],"names":[],"mappings":";;AAgCA,gDAgBC;AA8BD,sEAsBC;AA2BD,0CA2BC;AA1JD,+BAAsC;AAGtC,yDAAsD;AACtD,uHAAiH;AACjH,qDAAiD;AACjD,oEAA8D;AAS9D;;;;;;;;;;;;;;;;GAgBG;AACI,KAAK,UAAU,kBAAkB,CAAC,OAAiC;IACxE,MAAM,WAAW,GAAG,IAAA,4BAAW,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjD,IAAI,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,qBAAc,EAAC;QAC5C,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC,CAAC;IAEH,IAAI,gBAAgB,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AASD,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAExC;;;;;;;;;;;;;;;;;;GAkBG;AACI,KAAK,UAAU,6BAA6B,CACjD,OAA4C;IAE5C,IAAI,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC;QAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAA,4BAAW,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,MAAM,IAAA,sCAAgB,EAAC;QACpC,QAAQ;QACR,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC,CAAC;IAEH,OAAO,MAAM,KAAK,kBAAkB,CAAC;AACvC,CAAC;AAMD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,IAAI,gBAAgB,GAAG,KAAK,CAAC;AACtB,KAAK,UAAU,eAAe,CAAC,OAA8B;IAClE,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,6CAA6C;IAC/C,CAAC;IACD,IAAI,qCAAqC,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC;YACH,OAAO,MAAM,6BAA6B,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;QAAC,MAAM,CAAC;YACP,gCAAgC;QAClC,CAAC;IACH,CAAC;SAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC7B,oCAAoC;QACpC,gBAAgB,GAAG,IAAI,CAAC;QACxB,OAAO,CAAC,KAAK,CAAC;;;;;KAKb,CAAC,CAAC;IACL,CAAC;IACD,2DAA2D;IAC3D,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,qCAAqC,CAC5C,OAA8B;IAE9B,OAAO,CACL,OAAO,IAAI,OAAO;QAClB,OAAO,CAAC,KAAK,KAAK,SAAS;QAC3B,QAAQ,IAAI,OAAO;QACnB,OAAO,CAAC,MAAM,KAAK,SAAS,CAC7B,CAAC;AACJ,CAAC"}