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.

Sign up for GitHub

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

Jump to bottom

feat: delete the claim flow and redirect to the marketplace #3002

Merged
merged 2 commits into from
Jan 4, 2024
Merged

feat: delete the claim flow and redirect to the marketplace #3002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
355648c
feat: delete the claim flow and redirect to the marketplace
juanmahidalgo Dec 22, 2023
d6d45eb
Merge branch 'master' into feat/redirect-to-marketplace-to-claim-ens
juanmahidalgo Jan 4, 2024
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
36 changes: 0 additions & 36 deletions src/components/ClaimENSPage/ClaimENSPage.container.ts
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions src/components/ClaimENSPage/ClaimENSPage.css
View file
Open in desktop

This file was deleted.

176 changes: 0 additions & 176 deletions src/components/ClaimENSPage/ClaimENSPage.tsx
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/components/ClaimENSPage/ClaimENSPage.types.ts
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/components/ClaimENSPage/index.ts
View file
Open in desktop

This file was deleted.

14 changes: 2 additions & 12 deletions src/components/ENSListPage/ENSListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { Props, State, SortBy } from './ENSListPage.types'
import './ENSListPage.css'

const PAGE_SIZE = 12
const MARKETPLACE_WEB_URL = config.get('MARKETPLACE_WEB_URL', '')

export default class ENSListPage extends React.PureComponent<Props, State> {
state: State = {
Expand All @@ -22,8 +23,6 @@ export default class ENSListPage extends React.PureComponent<Props, State> {

handleNavigateToLand = () => this.props.onNavigate(locations.land())

handleClaimENS = () => this.props.onNavigate(locations.claimENS())

handleAssignENS = (ens: ENS) => {
this.props.onNavigate(locations.ensSelectLand(ens.subdomain))
}
Expand Down Expand Up @@ -123,15 +122,6 @@ export default class ENSListPage extends React.PureComponent<Props, State> {
<Column align="right">
<Row>{ensList.length > 1 ? this.renderSortDropdown() : null}</Row>
</Column>
<Column align="right" grow={false} shrink>
<Row>
<div className="actions">
<Button basic onClick={this.handleClaimENS}>
<Icon name="add-active" />
</Button>
</div>
</Row>
</Column>
</Row>
</Container>
</div>
Expand Down Expand Up @@ -227,7 +217,7 @@ export default class ENSListPage extends React.PureComponent<Props, State> {
id="ens_list_page.empty_names"
values={{
br: <br />,
link: <Link to={locations.claimENS()}>{t('global.click_here')}</Link>
link: <Link to={`${MARKETPLACE_WEB_URL}/names/mint`}>{t('global.click_here')}</Link>
}}
/>
</div>
Expand Down
7 changes: 5 additions & 2 deletions src/components/LandSelectENSPage/LandSelectENSForm/LandSelectENSForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react'
import { config } from 'config'
import { Form, Row, Button, Section, Header, Dropdown, DropdownProps } from 'decentraland-ui'
import { Network } from '@dcl/schemas'
import { NetworkButton } from 'decentraland-dapps/dist/containers'
Expand All @@ -9,6 +10,8 @@ import { isEqualContent } from 'modules/ens/utils'
import { Props, State } from './LandSelectENSForm.types'
import './LandSelectENSForm.css'

const MARKETPLACE_WEB_URL = config.get('MARKETPLACE_WEB_URL', '')

export default class LandSelectENSForm extends React.PureComponent<Props, State> {
state: State = {
selectedName: ''
Expand Down Expand Up @@ -46,7 +49,7 @@ export default class LandSelectENSForm extends React.PureComponent<Props, State>
<Link className="cancel" to={locations.landDetail(land.id)}>
<Button>{t('global.cancel')}</Button>
</Link>
<Link to={locations.claimENS()}>
<Link to={`${MARKETPLACE_WEB_URL}/names/mints`}>
<Button primary>{t('land_select_ens_page.claim_new_name')}</Button>
</Link>
</Row>
Expand All @@ -73,7 +76,7 @@ export default class LandSelectENSForm extends React.PureComponent<Props, State>
<T
id="land_select_ens_page.click_to_claim_new_name"
values={{
click_here: <Link to={locations.claimENS()}>{t('global.click_here')}</Link>
click_here: <Link to={`${MARKETPLACE_WEB_URL}/names/mints`}>{t('global.click_here')}</Link>
}}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modals/DeployModal/DeployToLand/DeployToLand.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ export default class DeployToLand extends React.PureComponent<Props, State> {
{t('deployment_modal.land.not_enough_land.publish_world')}
</Button>
) : (
<Button primary as={Link} className="action-button" to={locations.claimENS()}>
<Button primary as={Link} className="action-button" to={`${MARKETPLACE_WEB_URL}/names/mints`}>
{t('deployment_modal.land.not_enough_land.claim_name')}
</Button>
)}
Expand Down
Loading
Loading