Merge branch 'V4' into refactor/remove-modal-open-animation-delay

apps/demo/CHANGELOG.md

@@ -1,22 +1,22 @@
 # @apps/demo
 
-## 4.1.3
+## 4.1.3-5f2ae345.1
 
 ### Patch Changes
 
-- feat: release new schema for secure site
+- canary: test imports
 
 - Updated dependencies []:
-  - @web3modal/wagmi@4.1.3
+  - @web3modal/wagmi@4.1.3-5f2ae345.1
 
-## 4.1.3-c46ed093.0
+## 4.1.3-8e039e.0
 
 ### Patch Changes
 
-- canary: test secure site types
+- feat: update optional dependencies
 
 - Updated dependencies []:
-  - @web3modal/wagmi@4.1.3-c46ed093.0
+  - @web3modal/wagmi@4.1.3-8e039e.0
 
 ## 4.1.2
 

apps/demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apps/demo",
-  "version": "4.1.3",
+  "version": "4.1.3-5f2ae345.1",
   "private": true,
   "scripts": {
     "dev:demo": "next dev",
@@ -11,7 +11,7 @@
   "dependencies": {
     "@radix-ui/react-switch": "1.0.3",
     "@tanstack/react-query": "5.24.8",
-    "@web3modal/wagmi": "4.1.3",
+    "@web3modal/wagmi": "4.1.3-5f2ae345.1",
     "clsx": "2.1.0",
     "framer-motion": "11.0.8",
     "next": "14.1.1",

apps/gallery/CHANGELOG.md

@@ -1,24 +1,24 @@
 # @apps/gallery
 
-## 4.1.3
+## 4.1.3-5f2ae345.1
 
 ### Patch Changes
 
-- feat: release new schema for secure site
+- canary: test imports
 
 - Updated dependencies []:
-  - @web3modal/common@4.1.3
-  - @web3modal/ui@4.1.3
+  - @web3modal/common@4.1.3-5f2ae345.1
+  - @web3modal/ui@4.1.3-5f2ae345.1
 
-## 4.1.3-c46ed093.0
+## 4.1.3-8e039e.0
 
 ### Patch Changes
 
-- canary: test secure site types
+- feat: update optional dependencies
 
 - Updated dependencies []:
-  - @web3modal/common@4.1.3-c46ed093.0
-  - @web3modal/ui@4.1.3-c46ed093.0
+  - @web3modal/common@4.1.3-8e039e.0
+  - @web3modal/ui@4.1.3-8e039e.0
 
 ## 4.1.2
 

apps/gallery/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apps/gallery",
-  "version": "4.1.3",
+  "version": "4.1.3-5f2ae345.1",
   "private": true,
   "main": "index.js",
   "scripts": {
@@ -9,8 +9,8 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/common": "4.1.3",
-    "@web3modal/ui": "4.1.3",
+    "@web3modal/common": "4.1.3-5f2ae345.1",
+    "@web3modal/ui": "4.1.3-5f2ae345.1",
     "lit": "3.1.0",
     "storybook": "7.6.7"
   },

apps/laboratory/CHANGELOG.md

@@ -1,28 +1,28 @@
 # @apps/laboratory
 
-## 4.1.3
+## 4.1.3-5f2ae345.1
 
 ### Patch Changes
 
-- feat: release new schema for secure site
+- canary: test imports
 
 - Updated dependencies []:
-  - @web3modal/ethers@4.1.3
-  - @web3modal/siwe@4.1.3
-  - @web3modal/solana@4.1.3
-  - @web3modal/wagmi@4.1.3
+  - @web3modal/ethers@4.1.3-5f2ae345.1
+  - @web3modal/solana@4.1.3-5f2ae345.1
+  - @web3modal/wagmi@4.1.3-5f2ae345.1
+  - @web3modal/siwe@4.1.3-5f2ae345.1
 
-## 4.1.3-c46ed093.0
+## 4.1.3-8e039e.0
 
 ### Patch Changes
 
-- canary: test secure site types
+- feat: update optional dependencies
 
 - Updated dependencies []:
-  - @web3modal/ethers@4.1.3-c46ed093.0
-  - @web3modal/siwe@4.1.3-c46ed093.0
-  - @web3modal/solana@4.1.3-c46ed093.0
-  - @web3modal/wagmi@4.1.3-c46ed093.0
+  - @web3modal/ethers@4.1.3-8e039e.0
+  - @web3modal/solana@4.1.3-8e039e.0
+  - @web3modal/wagmi@4.1.3-8e039e.0
+  - @web3modal/siwe@4.1.3-8e039e.0
 
 ## 4.1.2
 

apps/laboratory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apps/laboratory",
-  "version": "4.1.3",
+  "version": "4.1.3-5f2ae345.1",
   "private": true,
   "scripts": {
     "dev:laboratory": "next dev",
@@ -12,11 +12,13 @@
     "playwright:test:wallet": "playwright test --grep 'connect-qr.spec.ts|wallet.spec.ts'",
     "playwright:test:email": "playwright test --grep 'email.spec.ts'",
     "playwright:test:siwe": "playwright test --grep siwe.spec.ts",
+    "playwright:test:sa": "playwright test --grep smart-account.spec.ts",
     "playwright:test:canary": "playwright test --retries=0 --grep canary.spec.ts --project='Desktop Chrome/wagmi'",
     "playwright:debug": "npm run playwright:test -- --debug",
     "playwright:debug:wallet": "npm run playwright:test:wallet -- --debug",
     "playwright:debug:email": "npm run playwright:test:email -- --debug",
     "playwright:debug:siwe": "npm run playwright:test:siwe -- --debug",
+    "playwright:debug:sa": "npm run playwright:test:sa -- --debug",
     "playwright:debug:canary": "npm run playwright:test:canary -- --debug"
   },
   "dependencies": {
@@ -27,10 +29,10 @@
     "@sentry/react": "7.92.0",
     "@solana/web3.js": "1.87.6",
     "@tanstack/react-query": "5.24.8",
-    "@web3modal/ethers": "4.1.3",
-    "@web3modal/siwe": "4.1.3",
-    "@web3modal/solana": "4.1.3",
-    "@web3modal/wagmi": "4.1.3",
+    "@web3modal/ethers": "4.1.3-5f2ae345.1",
+    "@web3modal/siwe": "4.1.3-5f2ae345.1",
+    "@web3modal/solana": "4.1.3-5f2ae345.1",
+    "@web3modal/wagmi": "4.1.3-5f2ae345.1",
     "ethers": "6.9.0",
     "framer-motion": "10.17.9",
     "next": "14.0.4",

apps/laboratory/src/components/Ethers/EthersTransactionTest.tsx

@@ -1,7 +1,7 @@
 import { Button, useToast, Stack, Link, Text, Spacer } from '@chakra-ui/react'
 import { useWeb3ModalAccount, useWeb3ModalProvider } from '@web3modal/ethers/react'
 import { BrowserProvider, JsonRpcSigner, ethers } from 'ethers'
-import { sepolia } from '../../utils/ChainsUtil'
+import { sepolia, optimism } from '../../utils/ChainsUtil'
 import { useState } from 'react'
 import { vitalikEthAddress } from '../../utils/DataUtil'
 
@@ -21,9 +21,7 @@ export function EthersTransactionTest() {
       const signer = new JsonRpcSigner(provider, address)
       const tx = await signer.sendTransaction({
         to: vitalikEthAddress,
-        value: ethers.parseUnits('0.0001', 'gwei'),
-        maxFeePerGas: ethers.parseUnits('200', 'gwei'),
-        maxPriorityFeePerGas: ethers.parseUnits('200', 'gwei')
+        value: ethers.parseUnits('0.0001', 'gwei')
       })
       toast({ title: 'Succcess', description: tx.hash, status: 'success', isClosable: true })
     } catch {
@@ -38,7 +36,9 @@ export function EthersTransactionTest() {
     }
   }
 
-  return chainId === sepolia.chainId && address ? (
+  const allowedChains = [sepolia.chainId, optimism.chainId]
+
+  return allowedChains.includes(Number(chainId)) && address ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-test-id="sign-transaction-button"
@@ -64,7 +64,7 @@ export function EthersTransactionTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }

apps/laboratory/src/components/Ethers/EthersWriteContractTest.tsx

@@ -1,7 +1,7 @@
 import { Button, useToast, Stack, Link, Text, Spacer } from '@chakra-ui/react'
 import { useWeb3ModalAccount, useWeb3ModalProvider } from '@web3modal/ethers/react'
 import { BrowserProvider, JsonRpcSigner, ethers } from 'ethers'
-import { sepolia } from '../../utils/ChainsUtil'
+import { optimism, sepolia } from '../../utils/ChainsUtil'
 import { useState } from 'react'
 
 import { abi, address as donutAddress } from '../../utils/DonutContract'
@@ -35,8 +35,9 @@ export function EthersWriteContractTest() {
       setLoading(false)
     }
   }
+  const allowedChains = [sepolia.chainId, optimism.chainId]
 
-  return chainId === sepolia.chainId && address ? (
+  return allowedChains.includes(Number(chainId)) && address ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-test-id="sign-transaction-button"
@@ -62,7 +63,7 @@ export function EthersWriteContractTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }

apps/laboratory/src/components/Wagmi/WagmiSendUSDCTest.tsx

@@ -1,7 +1,7 @@
 import { Button, useToast, Stack, Link, Text, Spacer, Input } from '@chakra-ui/react'
 import { useAccount, useWriteContract } from 'wagmi'
 import { useCallback, useState } from 'react'
-import { sepolia } from 'wagmi/chains'
+import { optimism, sepolia } from 'wagmi/chains'
 
 const minTokenAbi = [
   {
@@ -70,25 +70,27 @@ export function WagmiSendUSDCTest() {
     })
   }, [writeContract, address, amount])
 
-  return chain?.id === sepolia.id && status === 'connected' ? (
+  const allowedChains = [sepolia.id, optimism.id] as number[]
+
+  return allowedChains.includes(Number(chain?.id)) && status === 'connected' ? (
     <Stack direction={['column', 'column', 'row']}>
+      <Spacer />
+      <Input placeholder="0xf34ffa..." onChange={e => setAddress(e.target.value)} value={address} />
+      <Input
+        placeholder="Units (1000000000 for 1 USDC)"
+        onChange={e => setAmount(e.target.value)}
+        value={amount}
+        type="number"
+      />
       <Button
         data-test-id="sign-transaction-button"
         onClick={onSendTransaction}
         disabled={!writeContract}
         isDisabled={isLoading}
+        width="80%"
       >
         Send USDC
       </Button>
-
-      <Spacer />
-      <Input placeholder="0xf34ffa..." onChange={e => setAddress(e.target.value)} value={address} />
-      <Input
-        placeholder="Enter an amount"
-        onChange={e => setAmount(e.target.value)}
-        value={amount}
-        type="number"
-      />
       <Link isExternal href="https://faucet.circle.com">
         <Button variant="outline" colorScheme="blue" isDisabled={isLoading}>
           USDC Faucet
@@ -97,7 +99,7 @@ export function WagmiSendUSDCTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }

apps/laboratory/src/components/Wagmi/WagmiTransactionTest.tsx

@@ -3,11 +3,11 @@ import { parseGwei, type Address } from 'viem'
 import { useEstimateGas, useSendTransaction, useAccount } from 'wagmi'
 import { vitalikEthAddress } from '../../utils/DataUtil'
 import { useCallback, useState } from 'react'
-import { sepolia } from 'wagmi/chains'
+import { optimism, optimismSepolia, sepolia } from 'wagmi/chains'
 
 const TEST_TX = {
   to: vitalikEthAddress as Address,
-  value: parseGwei('0.3')
+  value: parseGwei('0.001')
 }
 
 export function WagmiTransactionTest() {
@@ -56,7 +56,9 @@ export function WagmiTransactionTest() {
     }
   }, [sendTransaction, prepareError])
 
-  return chain?.id === sepolia.id && status === 'connected' ? (
+  const allowedChains = [sepolia.id, optimism.id, optimismSepolia.id] as number[]
+
+  return allowedChains.includes(Number(chain?.id)) && status === 'connected' ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-test-id="sign-transaction-button"
@@ -83,7 +85,7 @@ export function WagmiTransactionTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }

apps/laboratory/src/components/Wagmi/WagmiWriteContractTest.tsx

@@ -2,7 +2,7 @@ import { Button, useToast, Stack, Link, Text, Spacer, Flex } from '@chakra-ui/re
 import { parseEther } from 'viem'
 import { useAccount, useSimulateContract, useWriteContract, useReadContract } from 'wagmi'
 import { useCallback, useEffect } from 'react'
-import { sepolia } from 'wagmi/chains'
+import { optimism, sepolia } from 'wagmi/chains'
 import { abi, address } from '../../utils/DonutContract'
 
 export function WagmiWriteContractTest() {
@@ -62,7 +62,9 @@ export function WagmiWriteContractTest() {
     reset()
   }, [data, error])
 
-  return chain?.id === sepolia.id && status === 'connected' ? (
+  const allowedChains = [sepolia.id, optimism.id] as number[]
+
+  return allowedChains.includes(Number(chain?.id)) && status === 'connected' ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-test-id="sign-transaction-button"
@@ -96,7 +98,7 @@ export function WagmiWriteContractTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }

apps/laboratory/src/utils/WagmiConstants.ts

@@ -12,6 +12,7 @@ import {
   zkSync,
   zora,
   sepolia,
+  optimismSepolia,
   type Chain
 } from 'wagmi/chains'
 
@@ -29,6 +30,7 @@ export const WagmiConstantsUtil = {
     base,
     celo,
     aurora,
-    sepolia
+    sepolia,
+    optimismSepolia
   ] as [Chain, ...Chain[]]
 }