Merge branch 'V4' of github.com:WalletConnect/web3modal into feat/demo

.github/workflows/ci_canary.yml → .github/workflows/publish_canary.yml

@@ -1,4 +1,4 @@
-name: ci_canary
+name: Publish Canary Image
 on:
   workflow_dispatch:
   push:

Dockerfile.canary

@@ -1,20 +1,12 @@
-FROM node:20-bookworm as base
+FROM node:20-bookworm
 
-
-WORKDIR /
-
-# RUN apk --update --no-cache \
-#     add g++ make python3
-
-FROM base as build
-
-WORKDIR /
+WORKDIR /src
 
 COPY ../ ./
 RUN npm ci
 RUN npm run build
 
-WORKDIR /apps/laboratory/
+WORKDIR ./apps/laboratory/
 
 RUN npm run playwright:install
 

apps/gallery/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @apps/gallery
 
+## 4.1.1
+
+### Patch Changes
+
+- Fix siwe version
+
+- Updated dependencies []:
+  - @web3modal/common@4.1.1
+  - @web3modal/ui@4.1.1
+
+## 4.1.0
+
+### Minor Changes
+
+- Email Stable release
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @web3modal/common@4.1.0
+  - @web3modal/ui@4.1.0
+
 ## 4.0.13
 
 ### Patch Changes

apps/gallery/package.json

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

apps/gallery/stories/composites/wui-button.stories.ts

@@ -19,7 +19,7 @@ export default {
   },
   argTypes: {
     size: {
-      options: ['sm', 'md'],
+      options: ['sm', 'md', 'lg'],
       control: { type: 'select' }
     },
     variant: {

apps/gallery/stories/composites/wui-input-amount.stories.ts

@@ -0,0 +1,28 @@
+import type { Meta } from '@storybook/web-components'
+import '@web3modal/ui/src/composites/wui-input-amount'
+import type { WuiInputAmount } from '@web3modal/ui/src/composites/wui-input-amount'
+import { html } from 'lit'
+import '../../components/gallery-container'
+
+type Component = Meta<WuiInputAmount>
+
+export default {
+  title: 'Composites/wui-input-amount',
+  args: {
+    disabled: false,
+    placeholder: '0'
+  },
+  argTypes: {
+    disabled: {
+      control: { type: 'boolean' }
+    }
+  }
+} as Component
+
+export const Default: Component = {
+  render: args =>
+    html` <wui-input-amount
+      placeholder=${args.placeholder}
+      ?disabled=${args.disabled}
+    ></wui-input-amount>`
+}

apps/gallery/stories/composites/wui-list-description.stories.ts

@@ -0,0 +1,48 @@
+import type { Meta } from '@storybook/web-components'
+import '@web3modal/ui/src/composites/wui-list-description'
+import type { WuiListDescription } from '@web3modal/ui/src/composites/wui-list-description'
+import { html } from 'lit'
+import '../../components/gallery-container'
+import { colorOptions, iconOptions } from '../../utils/PresetUtils'
+
+type Component = Meta<WuiListDescription>
+
+export default {
+  title: 'Composites/wui-list-description',
+  args: {
+    icon: 'card',
+    text: 'Buy Crypto',
+    tag: 'Popular',
+    description: 'Easy with card or bank account',
+    iconBackgroundColor: 'success-100',
+    iconColor: 'success-100'
+  },
+  argTypes: {
+    icon: {
+      options: iconOptions,
+      control: { type: 'select' }
+    },
+    iconBackgroundColor: {
+      options: colorOptions,
+      control: { type: 'select' }
+    },
+    iconColor: {
+      options: colorOptions,
+      control: { type: 'select' }
+    }
+  }
+} as Component
+
+export const Default: Component = {
+  render: args =>
+    html` <gallery-container width="336">
+      <wui-list-description
+        icon=${args.icon}
+        text=${args.text}
+        .tag=${args.tag}
+        description=${args.description}
+        iconBackgroundColor=${args.iconBackgroundColor}
+        iconColor=${args.iconColor}
+      ></wui-list-description>
+    </gallery-container>`
+}

apps/gallery/stories/composites/wui-list-token.stories.ts

@@ -0,0 +1,32 @@
+import type { Meta } from '@storybook/web-components'
+import '@web3modal/ui/src/composites/wui-list-token'
+import type { WuiListToken } from '@web3modal/ui/src/composites/wui-list-token'
+import { html } from 'lit'
+import '../../components/gallery-container'
+import { networkImageSrc } from '../../utils/PresetUtils'
+
+type Component = Meta<WuiListToken>
+
+export default {
+  title: 'Composites/wui-list-token',
+  args: {
+    tokenName: 'Ethereum',
+    tokenImageUrl: networkImageSrc,
+    tokenValue: '$1,740.72',
+    tokenAmount: 0.867,
+    tokenCurrency: 'ETH'
+  }
+} as Component
+
+export const Default: Component = {
+  render: args =>
+    html` <gallery-container width="336">
+      <wui-list-token
+        tokenName=${args.tokenName}
+        tokenImageUrl=${args.tokenImageUrl}
+        tokenValue=${args.tokenValue}
+        tokenAmount=${args.tokenAmount}
+        tokenCurrency=${args.tokenCurrency}
+      ></wui-list-token>
+    </gallery-container>`
+}

apps/gallery/stories/composites/wui-preview-item.stories.ts

@@ -0,0 +1,34 @@
+import type { Meta } from '@storybook/web-components'
+import '@web3modal/ui/src/composites/wui-preview-item'
+import type { WuiPreviewItem } from '@web3modal/ui/src/composites/wui-preview-item'
+import { html } from 'lit'
+import { address, networkImageSrc } from '../../utils/PresetUtils'
+
+type Component = Meta<WuiPreviewItem>
+
+export default {
+  title: 'Composites/wui-preview-item',
+  args: {
+    imageSrc: networkImageSrc,
+    address,
+    text: '0.2 ETH',
+    isAddress: false
+  },
+  argTypes: {
+    isAddress: {
+      control: { type: 'boolean' }
+    }
+  }
+} as Component
+
+export const Default: Component = {
+  render: args => html`
+    <wui-preview-item
+      text=${args.text}
+      ?isAddress=${args.isAddress}
+      .address=${args.address}
+      .imageSrc=${args.imageSrc}
+    >
+    </wui-preview-item>
+  `
+}

apps/gallery/stories/composites/wui-tag.stories.ts

@@ -9,16 +9,21 @@ type Component = Meta<WuiTag>
 export default {
   title: 'Composites/wui-tag',
   args: {
-    variant: 'main'
+    variant: 'main',
+    size: 'lg'
   },
   argTypes: {
     variant: {
       options: tagOptions,
       control: { type: 'select' }
+    },
+    size: {
+      options: ['lg', 'md'],
+      control: { type: 'select' }
     }
   }
 } as Component
 
 export const Default: Component = {
-  render: args => html`<wui-tag variant=${args.variant}>Recent</wui-tag>`
+  render: args => html`<wui-tag size=${args.size} variant=${args.variant}>Recent</wui-tag>`
 }

apps/gallery/stories/composites/wui-token-button.stories.ts

@@ -0,0 +1,20 @@
+import type { Meta } from '@storybook/web-components'
+import '@web3modal/ui/src/composites/wui-token-button'
+import type { WuiTokenButton } from '@web3modal/ui/src/composites/wui-token-button'
+import { html } from 'lit'
+import { networkImageSrc } from '../../utils/PresetUtils'
+
+type Component = Meta<WuiTokenButton>
+
+export default {
+  title: 'Composites/wui-token-button',
+  args: {
+    text: 'ETH',
+    imageSrc: networkImageSrc
+  }
+} as Component
+
+export const Default: Component = {
+  render: args =>
+    html`<wui-token-button text=${args.text} .imageSrc=${args.imageSrc}>Recent</wui-token-button>`
+}

apps/gallery/utils/PresetUtils.ts

@@ -33,6 +33,7 @@ export const colorOptions: ColorType[] = [
   'accent-100',
   'error-100',
   'fg-100',
+  'fg-150',
   'fg-200',
   'fg-300',
   'inherit',
@@ -44,10 +45,12 @@ export const colorOptions: ColorType[] = [
 export const textOptions: TextType[] = [
   'micro-700',
   'micro-600',
+  'mini-700',
   'tiny-500',
   'tiny-600',
   'small-500',
   'small-600',
+  'medium-400',
   'paragraph-400',
   'paragraph-500',
   'paragraph-600',

apps/laboratory/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @apps/laboratory
 
+## 4.1.1
+
+### Patch Changes
+
+- Fix siwe version
+
+- Updated dependencies []:
+  - @web3modal/ethers@4.1.1
+  - @web3modal/siwe@4.1.1
+  - @web3modal/wagmi@4.1.1
+
+## 4.1.0
+
+### Minor Changes
+
+- Email Stable release
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @web3modal/ethers@4.1.0
+  - @web3modal/siwe@4.1.0
+  - @web3modal/wagmi@4.1.0
+
 ## 4.0.13
 
 ### Patch Changes

apps/laboratory/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@apps/laboratory",
-  "version": "4.0.13",
+  "version": "4.1.1",
   "private": true,
   "scripts": {
     "dev:laboratory": "next dev",
     "build:laboratory": "next build",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "playwright:start": "npm run dev:laboratory",
-    "playwright:install": "npx playwright install --with-deps",
-    "playwright:test": "npx playwright test",
-    "playwright:test:wallet": "npx playwright test --grep 'connect-qr.spec.ts|wallet.spec.ts'",
-    "playwright:test:siwe": "npx playwright test --grep siwe.spec.ts",
-    "playwright:test:canary": "npx playwright test --retries=0 --grep canary.spec.ts --project='Desktop Chrome/wagmi'",
+    "playwright:install": "playwright install --with-deps",
+    "playwright:test": "playwright test",
+    "playwright:test:wallet": "playwright test --grep 'connect-qr.spec.ts|wallet.spec.ts'",
+    "playwright:test:siwe": "playwright test --grep siwe.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:siwe": "npm run playwright:test:siwe -- --debug",
@@ -24,9 +24,9 @@
     "@sentry/browser": "7.92.0",
     "@sentry/react": "7.92.0",
     "@tanstack/react-query": "5.17.19",
-    "@web3modal/ethers": "4.0.13",
-    "@web3modal/siwe": "4.0.13",
-    "@web3modal/wagmi": "4.0.13",
+    "@web3modal/ethers": "4.1.1",
+    "@web3modal/siwe": "4.1.1",
+    "@web3modal/wagmi": "4.1.1",
     "framer-motion": "10.17.9",
     "next": "14.0.4",
     "next-auth": "4.24.5",

examples/html-ethers5/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @examples/html-ethers5
 
+## 4.1.1
+
+### Patch Changes
+
+- Fix siwe version
+
+- Updated dependencies []:
+  - @web3modal/ethers5@4.1.1
+
+## 4.1.0
+
+### Minor Changes
+
+- Email Stable release
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @web3modal/ethers5@4.1.0
+
 ## 4.0.13
 
 ### Patch Changes