Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: terms of service / privacy policy checkbox #3207

Merged
merged 23 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions .changeset/beige-dodos-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
'@reown/appkit-scaffold-ui': patch
'@apps/laboratory': patch
'@reown/appkit': patch
'@reown/appkit-core': patch
'@apps/gallery': patch
'@reown/appkit-ui': patch
'@apps/demo': patch
'@reown/appkit-adapter-ethers': patch
'@reown/appkit-adapter-ethers5': patch
'@reown/appkit-adapter-polkadot': patch
'@reown/appkit-adapter-solana': patch
'@reown/appkit-adapter-wagmi': patch
'@reown/appkit-utils': patch
'@reown/appkit-cdn': patch
'@reown/appkit-common': patch
'@reown/appkit-experimental': patch
'@reown/appkit-polyfills': patch
'@reown/appkit-siwe': patch
'@reown/appkit-siwx': patch
'@reown/appkit-wallet': patch
---

Introduced a new feature with an option to enable the terms of service and/or privacy policy checkbox.

**Example usage**

```ts
import { createAppKit } from '@reown/appkit/react'
import { mainnet } from '@reown/appkit/networks'

const modal = createAppKit({
adapters: [/* adapters */],
networks: [mainnet],
defaultNetwork: mainnet,
projectId: 'YOUR_PROJECT_ID',
features: {
legalCheckbox: true // Optional - defaults to false
},
termsConditionsUrl: '...',
privacyPolicyUrl: '...'
})
```
24 changes: 24 additions & 0 deletions apps/gallery/stories/composites/wui-checkbox.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import type { Meta } from '@storybook/web-components'
import '@reown/appkit-ui/src/composites/wui-checkbox'
import '@reown/appkit-ui/src/components/wui-icon'
import '@reown/appkit-ui/src/components/wui-text'
import type { WuiCheckBox } from '@reown/appkit-ui/src/composites/wui-checkbox'
import { html } from 'lit'

type Component = Meta<WuiCheckBox>

export default {
title: 'Composites/wui-checkbox',
args: {
checked: false
},
argTypes: {
checked: {
control: { type: 'boolean' }
}
}
} as Component

export const Default: Component = {
render: args => html`<wui-checkbox ?checked=${args.checked}></wui-checkbox>`
}
1 change: 1 addition & 0 deletions apps/laboratory/src/pages/library/ethers-no-email.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const modal = createAppKit({
features: {
analytics: true,
email: false,
legalCheckbox: true,
socials: []
},
termsConditionsUrl: 'https://reown.com/terms-of-service',
Expand Down
1 change: 1 addition & 0 deletions apps/laboratory/src/pages/library/ethers5-no-email.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const modal = createAppKit({
features: {
analytics: true,
email: false,
legalCheckbox: true,
socials: []
},
termsConditionsUrl: 'https://reown.com/terms-of-service',
Expand Down
5 changes: 4 additions & 1 deletion apps/laboratory/src/pages/library/solana-no-email.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ const modal = createAppKit({
analytics: false,
swaps: false,
email: false,
legalCheckbox: true,
socials: []
}
},
termsConditionsUrl: 'https://reown.com/terms-of-service',
privacyPolicyUrl: 'https://reown.com/privacy-policy'
})

ThemeStore.setModal(modal)
Expand Down
1 change: 1 addition & 0 deletions apps/laboratory/src/pages/library/wagmi-no-email.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const modal = createAppKit({
features: {
analytics: true,
email: false,
legalCheckbox: true,
socials: []
},
termsConditionsUrl: 'https://reown.com/terms-of-service',
Expand Down
7 changes: 7 additions & 0 deletions apps/laboratory/tests/no-email.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,10 @@ noEmailTest.afterAll(async () => {
noEmailTest('secure site iframe should not be present', () => {
modalValidator.expectSecureSiteFrameNotInjected()
})

noEmailTest('should check the terms of service and privacy policy checkbox', async () => {
await modalPage.openConnectModal()
await modalValidator.expectConnectViewToBeDisabled()
await modalPage.clickLegalCheckbox()
await modalValidator.expectConnectViewNotToBeDisabled()
})
13 changes: 13 additions & 0 deletions apps/laboratory/tests/shared/pages/ModalPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -571,4 +571,17 @@ export class ModalPage {
async switchNetworkWithHook() {
await this.page.getByTestId('switch-network-hook-button').click()
}

async clickLegalCheckbox() {
const legalCheckbox = this.page.getByTestId('w3m-legal-checkbox')
await expect(legalCheckbox).toBeVisible()
const boundingBox = await legalCheckbox.boundingBox()
if (!boundingBox) {
throw new Error('Legal checkbox bounding box not found')
}
const x = boundingBox.x + boundingBox.width / 2 - 100
const y = boundingBox.y + boundingBox.height / 2
// Click on the left side of the checkbox to avoid clicking on links
await this.page.mouse.click(x, y)
}
}
10 changes: 10 additions & 0 deletions apps/laboratory/tests/shared/validators/ModalValidator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,4 +330,14 @@ export class ModalValidator {
timeout: MAX_WAIT
})
}

async expectConnectViewToBeDisabled() {
const connectDisabled = this.page.locator('.connect.disabled')
await expect(connectDisabled).toBeVisible()
}

async expectConnectViewNotToBeDisabled() {
const connectDisabled = this.page.locator('.connect.disabled')
await expect(connectDisabled).not.toBeVisible()
}
}
1 change: 1 addition & 0 deletions packages/core/src/utils/ConstantsUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ export const ConstantsUtil = {
history: true,
analytics: true,
allWallets: true,
legalCheckbox: false,
smartSessions: false
} as Features
}
5 changes: 5 additions & 0 deletions packages/core/src/utils/TypeUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,11 @@ export type Features = {
* @type {boolean}
*/
smartSessions?: boolean
/**
* Enable or disable the terms of service and/or privacy policy checkbox.
* @default false
*/
legalCheckbox?: boolean
}

export type FeaturesKeys = keyof Features
Expand Down
1 change: 1 addition & 0 deletions packages/scaffold-ui/exports/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export * from '../src/partials/w3m-onramp-activity-item/index.js'
export * from '../src/partials/w3m-onramp-input/index.js'
export * from '../src/partials/w3m-onramp-provider-item/index.js'
export * from '../src/partials/w3m-legal-footer/index.js'
export * from '../src/partials/w3m-legal-checkbox/index.js'
export * from '../src/partials/w3m-mobile-download-links/index.js'
export * from '../src/partials/w3m-onramp-providers-footer/index.js'
export * from '../src/partials/w3m-snackbar/index.js'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ import {
} from '@reown/appkit-core'
import { customElement } from '@reown/appkit-ui'
import { LitElement, html } from 'lit'
import { state } from 'lit/decorators.js'
import { property, state } from 'lit/decorators.js'
import { ifDefined } from 'lit/directives/if-defined.js'

@customElement('w3m-all-wallets-widget')
export class W3mAllWalletsWidget extends LitElement {
// -- Members ------------------------------------------- //
private unsubscribe: (() => void)[] = []

// -- State & Properties -------------------------------- //
@property() public tabIdx?: number = undefined
@state() private connectors = ConnectorController.state.connectors
@state() private count = ApiController.state.count

Expand Down Expand Up @@ -58,6 +60,7 @@ export class W3mAllWalletsWidget extends LitElement {
tagLabel=${tagLabel}
tagVariant="shade"
data-testid="all-wallets"
tabIdx=${ifDefined(this.tabIdx)}
></wui-list-wallet>
`
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '@reown/appkit-core'
import { customElement } from '@reown/appkit-ui'
import { LitElement, html } from 'lit'
import { state } from 'lit/decorators.js'
import { property, state } from 'lit/decorators.js'
import { ifDefined } from 'lit/directives/if-defined.js'

@customElement('w3m-connect-announced-widget')
Expand All @@ -17,6 +17,8 @@ export class W3mConnectAnnouncedWidget extends LitElement {
private unsubscribe: (() => void)[] = []

// -- State & Properties -------------------------------- //
@property() public tabIdx?: number = undefined

@state() private connectors = ConnectorController.state.connectors

public constructor() {
Expand Down Expand Up @@ -58,6 +60,7 @@ export class W3mConnectAnnouncedWidget extends LitElement {
tagLabel="installed"
data-testid=${`wallet-selector-${connector.id}`}
.installed=${true}
tabIdx=${ifDefined(this.tabIdx)}
>
</wui-list-wallet>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@reown/appkit-core'
import { customElement } from '@reown/appkit-ui'
import { LitElement, html } from 'lit'
import { state } from 'lit/decorators.js'
import { property, state } from 'lit/decorators.js'
import { ifDefined } from 'lit/directives/if-defined.js'

@customElement('w3m-connect-custom-widget')
Expand All @@ -18,6 +18,8 @@ export class W3mConnectCustomWidget extends LitElement {
private unsubscribe: (() => void)[] = []

// -- State & Properties -------------------------------- //
@property() public tabIdx?: number = undefined

@state() private connectors = ConnectorController.state.connectors

public constructor() {
Expand Down Expand Up @@ -51,6 +53,7 @@ export class W3mConnectCustomWidget extends LitElement {
name=${wallet.name ?? 'Unknown'}
@click=${() => this.onConnectWallet(wallet)}
data-testid=${`wallet-selector-${wallet.id}`}
tabIdx=${ifDefined(this.tabIdx)}
>
</wui-list-wallet>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Connector } from '@reown/appkit-core'
import { AssetUtil, ConnectorController, RouterController } from '@reown/appkit-core'
import { customElement } from '@reown/appkit-ui'
import { LitElement, html } from 'lit'
import { state } from 'lit/decorators.js'
import { property, state } from 'lit/decorators.js'
import { ifDefined } from 'lit/directives/if-defined.js'

@customElement('w3m-connect-external-widget')
Expand All @@ -11,6 +11,8 @@ export class W3mConnectExternalWidget extends LitElement {
private unsubscribe: (() => void)[] = []

// -- State & Properties -------------------------------- //
@property() public tabIdx?: number = undefined

@state() private connectors = ConnectorController.state.connectors

public constructor() {
Expand Down Expand Up @@ -47,6 +49,7 @@ export class W3mConnectExternalWidget extends LitElement {
name=${connector.name ?? 'Unknown'}
data-testid=${`wallet-selector-external-${connector.id}`}
@click=${() => this.onConnector(connector)}
tabIdx=${ifDefined(this.tabIdx)}
>
</wui-list-wallet>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ import { customElement } from '@reown/appkit-ui'
import { LitElement, html } from 'lit'
import { ifDefined } from 'lit/directives/if-defined.js'
import { WalletUtil } from '../../utils/WalletUtil.js'
import { property } from 'lit/decorators.js'

@customElement('w3m-connect-featured-widget')
export class W3mConnectFeaturedWidget extends LitElement {
// -- Members ------------------------------------------- //
private unsubscribe: (() => void)[] = []

// -- State & Properties -------------------------------- //
@property() public tabIdx?: number = undefined

public override disconnectedCallback() {
this.unsubscribe.forEach(unsubscribe => unsubscribe())
}
Expand All @@ -33,6 +37,7 @@ export class W3mConnectFeaturedWidget extends LitElement {
imageSrc=${ifDefined(AssetUtil.getWalletImage(wallet))}
name=${wallet.name ?? 'Unknown'}
@click=${() => this.onConnectWallet(wallet)}
tabIdx=${ifDefined(this.tabIdx)}
>
</wui-list-wallet>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@ import {
} from '@reown/appkit-core'
import { customElement } from '@reown/appkit-ui'
import { LitElement, html } from 'lit'
import { state } from 'lit/decorators.js'
import { property, state } from 'lit/decorators.js'
import { ifDefined } from 'lit/directives/if-defined.js'

@customElement('w3m-connect-injected-widget')
export class W3mConnectInjectedWidget extends LitElement {
// -- Members ------------------------------------------- //
private unsubscribe: (() => void)[] = []

// -- State & Properties -------------------------------- //
// -- State & Properties -------------------------------- // // -- State & Properties -------------------------------- //
@property() public tabIdx?: number = undefined

@state() private connectors = ConnectorController.state.connectors

public constructor() {
Expand Down Expand Up @@ -77,6 +79,7 @@ export class W3mConnectInjectedWidget extends LitElement {
tagLabel="installed"
data-testid=${`wallet-selector-${connector.id}`}
@click=${() => this.onConnector(connector)}
tabIdx=${ifDefined(this.tabIdx)}
>
</wui-list-wallet>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from '@reown/appkit-core'
import { customElement } from '@reown/appkit-ui'
import { LitElement, html } from 'lit'
import { state } from 'lit/decorators.js'
import { property, state } from 'lit/decorators.js'
import { ifDefined } from 'lit/directives/if-defined.js'

@customElement('w3m-connect-multi-chain-widget')
Expand All @@ -16,6 +16,8 @@ export class W3mConnectMultiChainWidget extends LitElement {
private unsubscribe: (() => void)[] = []

// -- State & Properties -------------------------------- //
@property() public tabIdx?: number = undefined

@state() private connectors = ConnectorController.state.connectors

public constructor() {
Expand Down Expand Up @@ -53,6 +55,7 @@ export class W3mConnectMultiChainWidget extends LitElement {
tagLabel="multichain"
data-testid=${`wallet-selector-${connector.id}`}
@click=${() => this.onConnector(connector)}
tabIdx=${ifDefined(this.tabIdx)}
>
</wui-list-wallet>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ import type { WcWallet } from '@reown/appkit-core'
import { AssetUtil, RouterController, StorageUtil } from '@reown/appkit-core'
import { customElement } from '@reown/appkit-ui'
import { LitElement, html } from 'lit'
import { property } from 'lit/decorators.js'
import { ifDefined } from 'lit/directives/if-defined.js'

@customElement('w3m-connect-recent-widget')
export class W3mConnectRecentWidget extends LitElement {
// -- State & Properties -------------------------------- //
@property() public tabIdx?: number = undefined

// -- Render -------------------------------------------- //
public override render() {
const recent = StorageUtil.getRecentWallets()
Expand All @@ -26,6 +30,7 @@ export class W3mConnectRecentWidget extends LitElement {
@click=${() => this.onConnectWallet(wallet)}
tagLabel="recent"
tagVariant="shade"
tabIdx=${ifDefined(this.tabIdx)}
>
</wui-list-wallet>
`
Expand Down
Loading
Loading