fix conflicts

reown-com · Feb 2, 2024 · 5e6245f · 5e6245f
2 parents f43d698 + 58f5c44
commit 5e6245f
Show file tree

Hide file tree

Showing 87 changed files with 1,384 additions and 1,329 deletions.
diff --git a/.github/workflows/ui_tests.yml b/.github/workflows/ui_tests.yml
@@ -57,7 +57,7 @@ jobs:
         id: playwright-version
         run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package-lock.json').packages['apps/laboratory']['devDependencies']['@playwright/test'])")" >> $GITHUB_ENV
       - name: Cache playwright binaries
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: playwright-cache
         with:
           path: |

diff --git a/apps/gallery/package.json b/apps/gallery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/gallery",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "private": true,
   "main": "index.js",
   "scripts": {
@@ -9,8 +9,8 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/common": "4.0.0-alpha.1",
-    "@web3modal/ui": "4.0.0-alpha.1",
+    "@web3modal/common": "4.0.0-648b6755",
+    "@web3modal/ui": "4.0.0-648b6755",
     "lit": "3.1.0",
     "storybook": "7.6.7"
   },

diff --git a/apps/gallery/stories/composites/wui-list-network.stories.ts b/apps/gallery/stories/composites/wui-list-network.stories.ts
@@ -0,0 +1,28 @@
+import type { Meta } from '@storybook/web-components'
+import '@web3modal/ui/src/composites/wui-list-network'
+import { html } from 'lit'
+import '../../components/gallery-container'
+import { networkImageSrc, walletImagesOptions } from '../../utils/PresetUtils'
+import type { WuiListNetwork } from '@web3modal/ui'
+
+type Component = Meta<WuiListNetwork>
+
+export default {
+  title: 'Composites/wui-list-network',
+  args: {
+    walletImages: walletImagesOptions,
+    imageSrc: networkImageSrc,
+    name: 'Ethereum'
+  }
+} as Component
+
+export const Default: Component = {
+  render: args =>
+    html` <gallery-container width="336">
+      <wui-list-network
+        .imageSrc=${args.imageSrc}
+        ?disabled=${args.disabled}
+        name=${args.name}
+      ></wui-list-network>
+    </gallery-container>`
+}
diff --git a/apps/gallery/stories/composites/wui-network-image.stories.ts b/apps/gallery/stories/composites/wui-network-image.stories.ts
@@ -16,7 +16,7 @@ export default {
   },
   argTypes: {
     size: {
-      options: ['md', 'lg'],
+      options: ['sm', 'md', 'lg'],
       control: { type: 'select' }
     }
   }

diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/laboratory",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "private": true,
   "scripts": {
     "dev:laboratory": "next dev",
@@ -19,10 +19,10 @@
     "@emotion/styled": "11.11.0",
     "@sentry/browser": "7.92.0",
     "@sentry/react": "7.92.0",
-    "@tanstack/react-query": "5.14.1",
-    "@web3modal/ethers": "4.0.0-alpha.1",
-    "@web3modal/ethers5": "4.0.0-alpha.1",
-    "@web3modal/wagmi": "4.0.0-alpha.1",
+    "@tanstack/react-query": "5.17.19",
+    "@web3modal/ethers": "4.0.0-648b6755",
+    "@web3modal/ethers5": "4.0.0-648b6755",
+    "@web3modal/wagmi": "4.0.0-648b6755",
     "framer-motion": "10.17.9",
     "next": "14.0.4",
     "next-auth": "4.24.5",

diff --git a/apps/laboratory/src/pages/library/ethers.tsx b/apps/laboratory/src/pages/library/ethers.tsx
@@ -23,7 +23,8 @@ const modal = createWeb3Modal({
       name: 'react-wallet-v2',
       homepage: 'https://react-wallet-v2-git-chore-2111-walletconnect1.vercel.app',
       mobile_link: 'https://react-wallet.walletconnect.com',
-      desktop_link: 'https://react-wallet.walletconnect.com'
+      desktop_link: 'https://react-wallet.walletconnect.com',
+      webapp_link: 'https://react-wallet.walletconnect.com'
     }
   ]
 })

diff --git a/apps/laboratory/src/pages/library/wagmi-email.tsx b/apps/laboratory/src/pages/library/wagmi-email.tsx
@@ -15,7 +15,8 @@ export const wagmiConfig = defaultWagmiConfig({
   chains: WagmiConstantsUtil.chains,
   projectId: ConstantsUtil.ProjectId,
   metadata: ConstantsUtil.Metadata,
-  enableEmail: true
+  enableEmail: true,
+  ssr: true
 })
 
 const modal = createWeb3Modal({

diff --git a/apps/laboratory/src/pages/library/wagmi-siwe.tsx b/apps/laboratory/src/pages/library/wagmi-siwe.tsx
@@ -15,7 +15,8 @@ const queryClient = new QueryClient()
 export const wagmiConfig = defaultWagmiConfig({
   chains: WagmiConstantsUtil.chains,
   projectId: ConstantsUtil.ProjectId,
-  metadata: ConstantsUtil.Metadata
+  metadata: ConstantsUtil.Metadata,
+  ssr: true
 })
 
 const modal = createWeb3Modal({

diff --git a/examples/html-ethers5/package.json b/examples/html-ethers5/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/html-ethers5",
   "private": true,
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "scripts": {
     "dev:example": "vite --port 3011",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/ethers5": "4.0.0-alpha.1",
+    "@web3modal/ethers5": "4.0.0-648b6755",
     "ethers": "5.7.2"
   },
   "devDependencies": {

diff --git a/examples/html-wagmi/package.json b/examples/html-wagmi/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/html-wagmi",
   "private": true,
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "scripts": {
     "dev:example": "vite --port 3001",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/wagmi": "4.0.0-alpha.1",
+    "@web3modal/wagmi": "4.0.0-648b6755",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

diff --git a/examples/next-wagmi/package.json b/examples/next-wagmi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@examples/next-wagmi",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@tanstack/react-query": "5.17.19",
-    "@web3modal/wagmi": "4.0.0-alpha.1",
+    "@web3modal/wagmi": "4.0.0-648b6755",
     "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",

diff --git a/examples/react-ethers5/package.json b/examples/react-ethers5/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/react-ethers5",
   "private": true,
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "scripts": {
     "dev:example": "vite --port 3012",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/ethers5": "4.0.0-alpha.1",
+    "@web3modal/ethers5": "4.0.0-648b6755",
     "ethers": "5.7.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"

diff --git a/examples/react-wagmi/package.json b/examples/react-wagmi/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@examples/react-wagmi",
   "private": true,
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "scripts": {
     "dev:example": "vite --port 3002",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@tanstack/react-query": "5.14.1",
-    "@web3modal/wagmi": "4.0.0-alpha.1",
+    "@tanstack/react-query": "5.17.19",
+    "@web3modal/wagmi": "4.0.0-648b6755",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "viem": "2.5.0",

diff --git a/examples/vue-ethers5/package.json b/examples/vue-ethers5/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/vue-ethers5",
   "private": true,
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "scripts": {
     "dev:example": "vite --port 3013",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/ethers5": "4.0.0-alpha.1",
+    "@web3modal/ethers5": "4.0.0-648b6755",
     "ethers": "5.7.2"
   },
   "devDependencies": {

diff --git a/examples/vue-wagmi/package.json b/examples/vue-wagmi/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/vue-wagmi",
   "private": true,
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "scripts": {
     "dev:example": "vite --port 3003",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/wagmi": "4.0.0-alpha.1"
+    "@web3modal/wagmi": "4.0.0-648b6755"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "5.0.2"

diff --git a/lerna.json b/lerna.json
@@ -17,6 +17,6 @@
     "apps/*",
     "examples/*"
   ],
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-648b6755",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }