diff --git a/package-lock.json b/package-lock.json index 6cb565bb4c..195cbaa26c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27448,6 +27448,7 @@ "version": "3.6.0-alpha.0", "license": "Apache-2.0", "dependencies": { + "@web3modal/common": "3.6.0-alpha.0", "@web3modal/core": "3.6.0-alpha.0", "@web3modal/ui": "3.6.0-alpha.0", "lit": "3.1.0" diff --git a/package.json b/package.json index 071ecea106..c54b88642b 100644 --- a/package.json +++ b/package.json @@ -5,14 +5,14 @@ "type": "module", "scripts": { "build:clean": "turbo run build:clean", - "build": "turbo run build", + "build": "turbo run build:clean; turbo run build", "watch": "turbo run watch --concurrency=50 --continue", "gallery": "turbo run dev:gallery", "laboratory": "turbo run dev:laboratory", "examples": "turbo run dev:example", - "build:gallery": "turbo run build:gallery", - "build:laboratory": "turbo run build:laboratory", - "build:examples": "turbo run build:examples", + "build:gallery": "turbo run build:clean; turbo run build:gallery", + "build:laboratory": "turbo run build:clean; turbo run build:laboratory", + "build:examples": "turbo run build:clean; turbo run build:examples", "test": "turbo run test", "typecheck": "turbo run typecheck", "lint": "turbo run lint", @@ -21,7 +21,7 @@ "prettier:format": "prettier --write .", "clean": "rm -rf `find . -type d -name node_modules -o -name dist -o -name .next -o -name out`; rm package-lock.json", "new-version": "lerna version --no-git-tag-version --exact", - "pre-publish": "turbo lint typecheck prettier test; npm run new-version; npm install; turbo run build;", + "pre-publish": "turbo lint typecheck prettier test; npm run new-version; npm install", "publish:latest": "npm run build; lerna exec -- npm publish --no-private --access public --tag latest", "publish:alpha": "npm run build; lerna exec -- npm publish --no-private --access public --tag alpha", "publish:beta": "npm run build; lerna exec -- npm publish --no-private --access public --tag beta", diff --git a/packages/scaffold-utils/src/ConstantsUtil.ts b/packages/scaffold-utils/src/ConstantsUtil.ts index dd30f83ac6..15e649dd5b 100644 --- a/packages/scaffold-utils/src/ConstantsUtil.ts +++ b/packages/scaffold-utils/src/ConstantsUtil.ts @@ -10,5 +10,5 @@ export const ConstantsUtil = { ADD_CHAIN_METHOD: 'wallet_addEthereumChain', EIP6963_ANNOUNCE_EVENT: 'eip6963:announceProvider', EIP6963_REQUEST_EVENT: 'eip6963:requestProvider', - VERSION: '3.6.0-alpha.0' + VERSION: '3.6.0-37fb52b0' } diff --git a/packages/scaffold/package.json b/packages/scaffold/package.json index 9d833e402f..bc6d434d95 100644 --- a/packages/scaffold/package.json +++ b/packages/scaffold/package.json @@ -16,6 +16,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { + "@web3modal/common": "3.6.0-alpha.0", "@web3modal/core": "3.6.0-alpha.0", "@web3modal/ui": "3.6.0-alpha.0", "lit": "3.1.0" diff --git a/packages/ui/src/composites/wui-transaction-list-item/index.ts b/packages/ui/src/composites/wui-transaction-list-item/index.ts index 0a664a65ba..4b8c1eb38c 100644 --- a/packages/ui/src/composites/wui-transaction-list-item/index.ts +++ b/packages/ui/src/composites/wui-transaction-list-item/index.ts @@ -6,6 +6,7 @@ import type { TransactionStatus, TransactionDirection, TransactionImage } from ' import { resetStyles } from '../../utils/ThemeUtil.js' import '../../components/wui-text/index.js' import '../wui-transaction-visual/index.js' +import { ifDefined } from 'lit/directives/if-defined.js' import styles from './styles.js' @customElement('wui-transaction-list-item') @@ -15,27 +16,27 @@ export class WuiTransactionListItem extends LitElement { // -- State & Properties -------------------------------- // @property() public type: TransactionType = 'approve' - @property() public descriptions?: string[] + @property({ type: Array }) public descriptions?: string[] @property() public date?: string - @property() public onlyDirectionIcon?: boolean = false + @property({ type: Boolean }) public onlyDirectionIcon?: boolean = false @property() public status?: TransactionStatus @property() public direction?: TransactionDirection - @property() public images: TransactionImage[] = [] + @property({ type: Array }) public images: TransactionImage[] = [] // -- Render -------------------------------------------- // public override render() { return html` diff --git a/packages/ui/src/composites/wui-transaction-visual/index.ts b/packages/ui/src/composites/wui-transaction-visual/index.ts index 6c64dae4b1..750f77616e 100644 --- a/packages/ui/src/composites/wui-transaction-visual/index.ts +++ b/packages/ui/src/composites/wui-transaction-visual/index.ts @@ -18,11 +18,11 @@ export class WuiTransactionVisual extends LitElement { @property() public direction?: TransactionDirection - @property() public onlyDirectionIcon?: boolean + @property({ type: Boolean }) public onlyDirectionIcon?: boolean - @property() public images: TransactionImage[] = [] + @property({ type: Array }) public images: TransactionImage[] = [] - @property() public secondImage: TransactionImage = { + @property({ type: Object }) public secondImage: TransactionImage = { type: undefined, url: '' } diff --git a/turbo.json b/turbo.json index eb6a53f7f5..f63d5822ae 100644 --- a/turbo.json +++ b/turbo.json @@ -7,22 +7,18 @@ }, "build:polyfills": { "outputs": ["dist/**"], - "dependsOn": ["^build:clean"], "cache": false }, "build:common": { "outputs": ["dist/**"], - "dependsOn": ["^build:clean"], "cache": false }, "build:core": { "outputs": ["dist/**"], - "dependsOn": ["^build:polyfills", "^build:common"], "cache": false }, "build:ui": { "outputs": ["dist/**"], - "dependsOn": ["^build:polyfills", "^build:common"], "cache": false }, "build:wallet": { @@ -31,12 +27,12 @@ }, "build:scaffold": { "outputs": ["dist/**"], - "dependsOn": ["^build:core", "^build:ui", "^build:wallet"], + "dependsOn": ["^build:common", "^build:core", "^build:ui", "^build:wallet"], "cache": false }, "build:scaffold-utils": { "outputs": ["dist/**"], - "dependsOn": ["^build:scaffold"], + "dependsOn": ["^build:polyfills", "^build:scaffold"], "cache": false }, "build:scaffold-react": {