+ {t('ens_detail_page.alias')}
+ {t('ens_detail_page.unassign')}
+
+
+ )
+ }
+ return (
+
+ {t('ens_detail_page.alias')}
+
+ {avatar ? (
+ 
+ ) : (
+
+ )
+ }, [ens?.name, avatar, alias, handleSetAsAlias])
+
+ const addressField = useMemo(() => {
+ if (!ens?.ensAddressRecord) {
+ return (
+
+ ) : (
+
+ {t('ens_detail_page.address')}
+
+
+ )
+ }
+ return (
+
+ {t('ens_detail_page.address')}
+
+ 
+ {getCroppedAddress(ens.ensAddressRecord)}
+
+
+
+
+
+ )
+ }, [ens?.ensAddressRecord, handleAssignENSAddress])
+
+ const landField = useMemo(() => {
+ if (!ens?.landId) {
+ return (
+
+ {t('ens_detail_page.land')}
+
+
+ )
+ }
+ if (isCoords(ens.landId)) {
+ return (
+
+ {t('ens_detail_page.land')}
+
+ )
+ } else {
+ return (
+
+
+
+
+ {t('ens_detail_page.land')}
+
+ )
+ }
+ }, [ens?.landId, ens?.subdomain, handleAssignENS])
+
+ return (
+
+
+
+
+ 
+
+
+
+
+
+
+
+ {t('ens_detail_page.name')}
+
+
+ {ens?.name}.dcl.eth
+
+
+
+
+
+
+ {aliasField}
+ {addressField}
+ {landField}
+
+
+
+
+ )
+ } else {
+ return (
+
+
+
+ )
+ }
+ }
+
renderEnsList() {
const { ensList, hasProfileCreated } = this.props
const { page } = this.state
@@ -106,7 +179,6 @@ export default class ENSListPage extends React.PureComponent
@@ -238,8 +310,142 @@ export default class ENSListPage extends React.PureComponent {
)
}
+ renderNewEnsList() {
+ const { hasProfileCreated, ensList } = this.props
+ const { page } = this.state
+
+ const total = ensList.length
+ const totalPages = Math.ceil(total / PAGE_SIZE)
+ const paginatedItems = this.paginate()
+ return (
+ {
isLoading={isLoading}
isPageFullscreen={true}
>
- {this.renderEnsList()}
+ {isEnsAddressEnabled ? this.renderNewEnsList() : this.renderEnsList()}
)
}
diff --git a/src/components/ENSListPage/ENSListPage.types.ts b/src/components/ENSListPage/ENSListPage.types.ts
index 1ce6c5db9..19ae76227 100644
--- a/src/components/ENSListPage/ENSListPage.types.ts
+++ b/src/components/ENSListPage/ENSListPage.types.ts
@@ -2,6 +2,7 @@ import { Dispatch } from 'redux'
import { ENS } from 'modules/ens/types'
import { Land } from 'modules/land/types'
import { openModal } from 'modules/modal/actions'
+import { Avatar } from '@dcl/schemas'
export enum SortBy {
DESC = 'DESC',
@@ -17,6 +18,8 @@ export type Props = {
hasProfileCreated: boolean
isLoggedIn: boolean
isLoading: boolean
+ isEnsAddressEnabled: boolean
+ avatar: Avatar | null
onNavigate: (path: string) => void
onOpenModal: typeof openModal
}
@@ -28,7 +31,7 @@ export type State = {
export type MapStateProps = Pick<
Props,
- 'address' | 'alias' | 'ensList' | 'lands' | 'hasProfileCreated' | 'isLoading' | 'error' | 'isLoggedIn'
+ 'address' | 'alias' | 'ensList' | 'lands' | 'hasProfileCreated' | 'isLoading' | 'error' | 'isLoggedIn' | 'isEnsAddressEnabled' | 'avatar'
>
export type MapDispatchProps = Pick
export type MapDispatch = Dispatch
diff --git a/src/components/ENSListPage/utils.spec.ts b/src/components/ENSListPage/utils.spec.ts
new file mode 100644
index 000000000..8614c9355
--- /dev/null
+++ b/src/components/ENSListPage/utils.spec.ts
@@ -0,0 +1,21 @@
+import { getCroppedAddress } from './utils'
+
+describe('getCroppedAddress', () => {
+ describe('when address is a 42 character string', () => {
+ it('should return only the first 5 and last 6 characters of address', () => {
+ expect(getCroppedAddress('0xA4f689625F6F51AdF691988D38772BE8509087d2')).toEqual('0xA4f...9087d2')
+ })
+ })
+
+ describe('when address is undefined', () => {
+ it('should return empty string', () => {
+ expect(getCroppedAddress(undefined)).toEqual('')
+ })
+ })
+
+ describe('when address is not a 42 character string', () => {
+ it('should return empty string', () => {
+ expect(getCroppedAddress('0xA4f689625F6F51AdF691988D38772')).toEqual('')
+ })
+ })
+})
diff --git a/src/components/ENSListPage/utils.ts b/src/components/ENSListPage/utils.ts
new file mode 100644
index 000000000..581fafe30
--- /dev/null
+++ b/src/components/ENSListPage/utils.ts
@@ -0,0 +1,6 @@
+export function getCroppedAddress(address?: string) {
+ if (!address || address.length < 42) {
+ return ''
+ }
+ return `${address.slice(0, 5)}...${address.slice(-6)}`
+}
diff --git a/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.container.ts b/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.container.ts
new file mode 100644
index 000000000..d5cc558f3
--- /dev/null
+++ b/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.container.ts
@@ -0,0 +1,21 @@
+import { connect } from 'react-redux'
+import { SET_ENS_ADDRESS_REQUEST, setENSAddressRequest } from 'modules/ens/actions'
+import { isLoadingType } from 'decentraland-dapps/dist/modules/loading/selectors'
+import { getError, getLoading, isWaitingTxSetAddress } from 'modules/ens/selectors'
+import { RootState } from 'modules/common/types'
+import { MapDispatch, MapDispatchProps, OwnProps } from './ENSMapAddressModal.types'
+import EnsMapAddressModal from './ENSMapAddressModal'
+
+const mapState = (state: RootState) => {
+ const error = getError(state)
+ return {
+ isLoading: isLoadingType(getLoading(state), SET_ENS_ADDRESS_REQUEST) || isWaitingTxSetAddress(state),
+ error: error ? error.message : null
+ }
+}
+
+const mapDispatch = (dispatch: MapDispatch, ownProps: OwnProps): MapDispatchProps => ({
+ onSave: ((address: string) => dispatch(setENSAddressRequest(ownProps.metadata.ens, address))) as any
+})
+
+export default connect(mapState, mapDispatch)(EnsMapAddressModal)
diff --git a/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.module.css b/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.module.css
new file mode 100644
index 000000000..5c1ec189b
--- /dev/null
+++ b/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.module.css
@@ -0,0 +1,49 @@
+.main {
+ padding: 30px 40px;
+ display: flex;
+ flex-direction: column;
+ gap: 30px;
+}
+
+.info {
+ display: flex;
+ flex-direction: column;
+ gap: 15px;
+}
+
+.network {
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+}
+
+.actions {
+ display: flex;
+ width: 100%;
+ gap: 10px;
+}
+
+.actions :global(.ui.button) {
+ flex: 1;
+}
+
+.title {
+ font-size: 20px;
+ margin-bottom: 0;
+}
+
+.description {
+ font-size: 14px;
+ line-height: 22px;
+}
+
+.ethereum {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ font-size: 14px;
+}
+
+.ethereum img {
+ width: 24px;
+}
diff --git a/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.spec.tsx b/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.spec.tsx
new file mode 100644
index 000000000..72774274a
--- /dev/null
+++ b/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.spec.tsx
@@ -0,0 +1,61 @@
+import { renderWithProviders } from 'specs/utils'
+import { Props } from './ENSMapAddressModal.types'
+import EnsMapAddressModal from './ENSMapAddressModal'
+import userEvent from '@testing-library/user-event'
+import { RenderResult } from '@testing-library/react'
+import { t } from 'decentraland-dapps/dist/modules/translation/utils'
+
+function renderENSMapAddressModal(props: Partial = {}) {
+ return renderWithProviders(('')
+
+ const handleSave = useCallback(() => {
+ onSave(address)
+ }, [address, onSave])
+
+ const handleAddressChange = useCallback(
+ (_evt, { value }) => {
+ setAddress(value)
+ },
+ [setAddress]
+ )
+
+ useEffect(() => {
+ document.getElementById('address-input')?.focus()
+ }, [])
+
+ return (
+
+export type MapDispatchProps = Pick
+export type MapDispatch = Dispatch
+export type OwnProps = Omit
diff --git a/src/components/Modals/ENSMapAddressModal/index.ts b/src/components/Modals/ENSMapAddressModal/index.ts
new file mode 100644
index 000000000..6bd133624
--- /dev/null
+++ b/src/components/Modals/ENSMapAddressModal/index.ts
@@ -0,0 +1,2 @@
+import EnsMapAddressModal from './ENSMapAddressModal.container'
+export default EnsMapAddressModal
diff --git a/src/components/Modals/index.ts b/src/components/Modals/index.ts
index 47b3fa574..1ce6b650b 100644
--- a/src/components/Modals/index.ts
+++ b/src/components/Modals/index.ts
@@ -50,3 +50,4 @@ export { default as EditVideoModal } from './EditVideoModal'
export { default as EmotesV2AnnouncementModal } from './EmotesV2AnnouncementModal'
export { default as WorldsYourStorageModal } from './WorldsYourStorageModal'
export { default as WorldsForENSOwnersAnnouncementModal } from './WorldsForENSOwnersAnnouncementModal'
+export { default as EnsMapAddressModal } from './ENSMapAddressModal'
diff --git a/src/icons/ethereum.svg b/src/icons/ethereum.svg
new file mode 100644
index 000000000..5c676a920
--- /dev/null
+++ b/src/icons/ethereum.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/modules/ens/actions.ts b/src/modules/ens/actions.ts
index 3bc881261..8395bf97a 100644
--- a/src/modules/ens/actions.ts
+++ b/src/modules/ens/actions.ts
@@ -9,7 +9,7 @@ export const FETCH_ENS_REQUEST = '[Request] Fetch ENS'
export const FETCH_ENS_SUCCESS = '[Success] Fetch ENS'
export const FETCH_ENS_FAILURE = '[Failure] Fetch ENS'
-export const fetchENSRequest = (name: string, land: Land) => action(FETCH_ENS_REQUEST, { name, land })
+export const fetchENSRequest = (name: string, land?: Land) => action(FETCH_ENS_REQUEST, { name, land })
export const fetchENSSuccess = (ens: ENS) => action(FETCH_ENS_SUCCESS, { ens })
export const fetchENSFailure = (error: ENSError) => action(FETCH_ENS_FAILURE, { error })
@@ -74,6 +74,24 @@ export type SetENSContentRequestAction = ReturnType
export type SetENSContentSuccessAction = ReturnType
export type SetENSContentFailureAction = ReturnType
+// set address to ens
+export const SET_ENS_ADDRESS_REQUEST = '[Request] Set ENS Address'
+export const SET_ENS_ADDRESS_SUCCESS = '[Success] Set ENS Address'
+export const SET_ENS_ADDRESS_FAILURE = '[Failure] Set ENS Address'
+
+export const setENSAddressRequest = (ens: ENS, address: string) => action(SET_ENS_ADDRESS_REQUEST, { ens, address })
+export const setENSAddressSuccess = (ens: ENS, address: string, chainId: ChainId, txHash: string) =>
+ action(SET_ENS_ADDRESS_SUCCESS, {
+ ...buildTransactionPayload(chainId, txHash, { ens, address }),
+ ens,
+ address
+ })
+export const setENSAddressFailure = (ens: ENS, address: string, error: ENSError) => action(SET_ENS_ADDRESS_FAILURE, { ens, address, error })
+
+export type SetENSAddressRequestAction = ReturnType
+export type SetENSAddressSuccessAction = ReturnType
+export type SetENSAddressFailureAction = ReturnType
+
// Get a ENS List (list of names) owned by the current account
export const FETCH_ENS_LIST_REQUEST = '[Request] Fetch ENS List'
export const FETCH_ENS_LIST_SUCCESS = '[Success] Fetch ENS List'
diff --git a/src/modules/ens/reducer.spec.ts b/src/modules/ens/reducer.spec.ts
index 17e80212c..2c6ff3a0d 100644
--- a/src/modules/ens/reducer.spec.ts
+++ b/src/modules/ens/reducer.spec.ts
@@ -1,11 +1,22 @@
-import { FETCH_EXTERNAL_NAMES_REQUEST, fetchExternalNamesFailure, fetchExternalNamesRequest, fetchExternalNamesSuccess } from './actions'
+import { ChainId } from '@dcl/schemas'
+import {
+ FETCH_EXTERNAL_NAMES_REQUEST,
+ SET_ENS_ADDRESS_SUCCESS,
+ fetchExternalNamesFailure,
+ fetchExternalNamesRequest,
+ fetchExternalNamesSuccess,
+ setENSAddressFailure,
+ setENSAddressRequest
+} from './actions'
import { ENSState, INITIAL_STATE, ensReducer } from './reducer'
import { ENS, ENSError } from './types'
+import { fetchTransactionSuccess } from 'decentraland-dapps/dist/modules/transaction/actions'
+import { Transaction } from 'decentraland-dapps/dist/modules/transaction/types'
let state: ENSState
beforeEach(() => {
- state = INITIAL_STATE
+ state = { ...INITIAL_STATE }
})
describe('when handling the fetch external names actions', () => {
@@ -86,3 +97,92 @@ describe('when handling the fetch external names actions', () => {
})
})
})
+
+describe('when handling set ens address actions', () => {
+ let ens: ENS
+ let address: string
+
+ beforeEach(() => {
+ state = { ...INITIAL_STATE }
+ address = '0xtest'
+ ens = {
+ name: 'test',
+ subdomain: 'test.dcl.eth',
+ nftOwnerAddress: address
+ } as ENS
+ })
+
+ describe('when handling the set ens address request action', () => {
+ it('should add the set ens address request action to the loading state', () => {
+ const action = setENSAddressRequest(ens, address)
+ const newState = ensReducer(state, action)
+ expect(newState.loading[0]).toEqual(action)
+ })
+
+ it('should set the error as null', () => {
+ const action = setENSAddressRequest(ens, address)
+ const newState = ensReducer({ ...state, error: { message: 'some error' } }, action)
+ expect(newState.error).toEqual(null)
+ })
+ })
+
+ describe('when handling the set ens address failure action', () => {
+ let error: ENSError
+ beforeEach(() => {
+ error = { message: 'some error' }
+ state = {
+ ...state,
+ loading: [setENSAddressRequest(ens, address)]
+ }
+ })
+
+ it('should remove the set ens address request action from the loading state', () => {
+ const action = setENSAddressFailure(ens, address, error)
+ const newState = ensReducer(state, action)
+ expect(newState.loading.length).toEqual(0)
+ })
+
+ it('should add the error to the state', () => {
+ const action = setENSAddressFailure(ens, address, error)
+ const newState = ensReducer(state, action)
+ expect(newState.error).toEqual(error)
+ })
+ })
+
+ describe('when handling the set ens address success action', () => {
+ let action: ReturnType
+ beforeEach(() => {
+ state = {
+ ...state,
+ data: {
+ 'test.dcl.eth': {
+ subdomain: 'test.dcl.eth',
+ name: 'test'
+ } as ENS
+ },
+ error: { message: 'some error' },
+ loading: [setENSAddressRequest(ens, address)]
+ }
+
+ action = fetchTransactionSuccess({
+ actionType: SET_ENS_ADDRESS_SUCCESS,
+ payload: { ens, address, chainId: ChainId.ETHEREUM_SEPOLIA, hash: 'hash' }
+ } as Transaction)
+ })
+
+ it('should remove the set ens address request action from the loading state', () => {
+ const newState = ensReducer(state, action)
+ expect(newState.loading.length).toEqual(0)
+ })
+
+ it('should set the error as null', () => {
+ const newState = ensReducer(state, action)
+ expect(newState.error).toEqual(null)
+ })
+
+ it('should set the address to the subdomain', () => {
+ const newState = ensReducer(state, action)
+ expect(newState.data['test.dcl.eth'].ensAddressRecord).toEqual(address)
+ })
+ })
+})
diff --git a/src/modules/ens/reducer.ts b/src/modules/ens/reducer.ts
index c92572c20..9b89d5e83 100644
--- a/src/modules/ens/reducer.ts
+++ b/src/modules/ens/reducer.ts
@@ -62,7 +62,14 @@ import {
FetchExternalNamesRequestAction,
FetchExternalNamesSuccessAction,
FetchExternalNamesFailureAction,
- FETCH_EXTERNAL_NAMES_SUCCESS
+ FETCH_EXTERNAL_NAMES_SUCCESS,
+ SET_ENS_ADDRESS_REQUEST,
+ SET_ENS_ADDRESS_SUCCESS,
+ SET_ENS_ADDRESS_FAILURE,
+ SetENSAddressRequestAction,
+ SetENSAddressFailureAction,
+ SetENSAddressSuccessAction,
+ setENSAddressSuccess
} from './actions'
import { ENS, ENSError, Authorization } from './types'
import { isExternalName } from './utils'
@@ -116,6 +123,9 @@ export type ENSReducerAction =
| FetchExternalNamesRequestAction
| FetchExternalNamesSuccessAction
| FetchExternalNamesFailureAction
+ | SetENSAddressRequestAction
+ | SetENSAddressSuccessAction
+ | SetENSAddressFailureAction
export function ensReducer(state: ENSState = INITIAL_STATE, action: ENSReducerAction): ENSState {
switch (action.type) {
@@ -131,7 +141,8 @@ export function ensReducer(state: ENSState = INITIAL_STATE, action: ENSReducerAc
case SET_ENS_RESOLVER_SUCCESS:
case ALLOW_CLAIM_MANA_REQUEST:
case ALLOW_CLAIM_MANA_SUCCESS:
- case FETCH_EXTERNAL_NAMES_REQUEST: {
+ case FETCH_EXTERNAL_NAMES_REQUEST:
+ case SET_ENS_ADDRESS_REQUEST: {
return {
...state,
error: null,
@@ -259,7 +270,8 @@ export function ensReducer(state: ENSState = INITIAL_STATE, action: ENSReducerAc
case FETCH_ENS_LIST_FAILURE:
case FETCH_ENS_AUTHORIZATION_FAILURE:
case ALLOW_CLAIM_MANA_FAILURE:
- case FETCH_EXTERNAL_NAMES_FAILURE: {
+ case FETCH_EXTERNAL_NAMES_FAILURE:
+ case SET_ENS_ADDRESS_FAILURE: {
return {
...state,
loading: loadingReducer(state.loading, action),
@@ -285,6 +297,21 @@ export function ensReducer(state: ENSState = INITIAL_STATE, action: ENSReducerAc
}
}
}
+ case SET_ENS_ADDRESS_SUCCESS: {
+ const { ens, address, chainId, txHash } = transaction.payload
+ return {
+ ...state,
+ loading: loadingReducer(state.loading, setENSAddressSuccess(ens, address, chainId, txHash)),
+ error: null,
+ data: {
+ ...state.data,
+ [ens.subdomain]: {
+ ...state.data[ens.subdomain],
+ ensAddressRecord: address
+ }
+ }
+ }
+ }
case SET_ENS_CONTENT_SUCCESS: {
const { ens, content, land } = transaction.payload
const { subdomain } = ens
diff --git a/src/modules/ens/sagas.spec.ts b/src/modules/ens/sagas.spec.ts
index 96a5b62ef..6bd5789a6 100644
--- a/src/modules/ens/sagas.spec.ts
+++ b/src/modules/ens/sagas.spec.ts
@@ -1,14 +1,25 @@
import * as matchers from 'redux-saga-test-plan/matchers'
import { throwError } from 'redux-saga-test-plan/providers'
import { expectSaga } from 'redux-saga-test-plan'
+import { namehash } from '@ethersproject/hash'
import { call, select } from 'redux-saga/effects'
-import { ethers } from 'ethers'
+import { Signer, ethers } from 'ethers'
import { BuilderClient } from '@dcl/builder-client'
import { ChainId, Network } from '@dcl/schemas'
-import { ERC20__factory, ERC20, DCLController__factory, DCLRegistrar__factory, ENS__factory } from 'contracts'
+import {
+ ERC20__factory,
+ ERC20,
+ DCLController__factory,
+ DCLRegistrar__factory,
+ ENS__factory,
+ ENSResolver__factory,
+ ENSResolver
+} from 'contracts'
import { getChainIdByNetwork, getSigner } from 'decentraland-dapps/dist/lib/eth'
import { getAddress } from 'decentraland-dapps/dist/modules/wallet/selectors'
import { connectWalletSuccess } from 'decentraland-dapps/dist/modules/wallet/actions'
+import { waitForTx } from 'decentraland-dapps/dist/modules/transaction/utils'
+import { closeModal } from 'modules/modal/actions'
import { Wallet } from 'decentraland-dapps/dist/modules/wallet/types'
import { CONTROLLER_V2_ADDRESS, ENS_ADDRESS, MANA_ADDRESS, REGISTRAR_ADDRESS } from 'modules/common/contracts'
import { fetchWorldDeploymentsRequest } from 'modules/deployment/actions'
@@ -29,10 +40,13 @@ import {
fetchENSWorldStatusSuccess,
fetchExternalNamesFailure,
fetchExternalNamesRequest,
- fetchExternalNamesSuccess
+ fetchExternalNamesSuccess,
+ setENSAddressFailure,
+ setENSAddressRequest,
+ setENSAddressSuccess
} from './actions'
import { ensSaga } from './sagas'
-import { ENS, ENSError, WorldStatus } from './types'
+import { ENS, ENSError, ENSOrigin, WorldStatus } from './types'
import { getENSBySubdomain, getExternalNames } from './selectors'
import { addWorldStatusToEachENS } from './utils'
@@ -43,6 +57,7 @@ const MockBuilderClient = BuilderClient as jest.MockedClass {
resolver: jest.fn().mockResolvedValue(ethers.constants.AddressZero),
owner: jest.fn().mockResolvedValue('address')
} as unknown as ENS__factory
+ ensResolverContract = {
+ 'setAddr(bytes32,address)': jest.fn().mockResolvedValue(''),
+ 'addr(bytes32)': jest.fn().mockResolvedValue('0xaddr')
+ } as unknown as ENSResolver
})
describe('when handling the approve claim mana request', () => {
@@ -130,6 +149,7 @@ describe('when handling the claim name request', () => {
beforeEach(() => {
address = '0xanAddress'
jest.spyOn(WorldsAPI.prototype, 'fetchWorld').mockResolvedValue(null)
+ ENSResolver__factory.connect = jest.fn().mockReturnValue(ensResolverContract)
})
afterEach(() => {
jest.restoreAllMocks()
@@ -145,7 +165,8 @@ describe('when handling the claim name request', () => {
resolver: '0x0000000000000000000000000000000000000000',
content: '',
landId: undefined,
- worldStatus: null
+ worldStatus: null,
+ ensAddressRecord: '0xaddr'
}
const ENSList: ENS[] = validDomains.map(domain => ({
name: domain,
@@ -367,3 +388,49 @@ describe('when handling the wallet connection', () => {
.silentRun()
})
})
+
+describe('when handling the set ens address request', () => {
+ let signer: Signer
+ let address: string
+ let ens: ENS
+ let hash: string
+
+ beforeEach(() => {
+ ens = {
+ subdomain: 'test.dcl.eth',
+ name: 'test'
+ } as ENS
+ signer = {} as Signer
+ address = '0xtest'
+ hash = 'tx-hash'
+ ENSResolver__factory.connect = jest.fn().mockReturnValue(ensResolverContract)
+ })
+
+ it('should call resolver contract with the ens domain and address', () => {
+ return expectSaga(ensSaga, builderClient, ensApi)
+ .provide([
+ [call(getWallet), { address: 'address', chainId: ChainId.ETHEREUM_GOERLI }],
+ [call(getSigner), { signer }],
+ [call([ensResolverContract, 'setAddr(bytes32,address)'], namehash(ens.subdomain), address), { hash } as ethers.ContractTransaction],
+ [call(waitForTx, hash), true]
+ ])
+ .put(setENSAddressSuccess(ens, address, ChainId.ETHEREUM_GOERLI, hash))
+ .put(closeModal('EnsMapAddressModal'))
+ .dispatch(setENSAddressRequest(ens, address))
+ .silentRun()
+ })
+
+ it('should put the failure action when something goes wrong', () => {
+ const error = { message: 'an error message', code: 1, name: 'error' }
+ return expectSaga(ensSaga, builderClient, ensApi)
+ .provide([
+ [call(getWallet), { address: 'address', chainId: ChainId.ETHEREUM_GOERLI }],
+ [call(getSigner), { signer }],
+ [call([ensResolverContract, 'setAddr(bytes32,address)'], namehash(ens.subdomain), address), throwError(error)],
+ [call(waitForTx, hash), true]
+ ])
+ .put(setENSAddressFailure(ens, address, { message: error.message, code: error.code, origin: ENSOrigin.ADDRESS }))
+ .dispatch(setENSAddressRequest(ens, address))
+ .silentRun()
+ })
+})
diff --git a/src/modules/ens/sagas.ts b/src/modules/ens/sagas.ts
index ee4c83910..0acbc8d4a 100644
--- a/src/modules/ens/sagas.ts
+++ b/src/modules/ens/sagas.ts
@@ -74,7 +74,11 @@ import {
FetchExternalNamesRequestAction,
fetchExternalNamesSuccess,
fetchExternalNamesFailure,
- fetchExternalNamesRequest
+ fetchExternalNamesRequest,
+ SetENSAddressRequestAction,
+ setENSAddressSuccess,
+ setENSAddressFailure,
+ SET_ENS_ADDRESS_REQUEST
} from './actions'
import { getENSBySubdomain, getExternalNames } from './selectors'
import { ENS, ENSOrigin, ENSError, Authorization } from './types'
@@ -93,6 +97,7 @@ export function* ensSaga(builderClient: BuilderClient, ensApi: ENSApi) {
yield takeEvery(RECLAIM_NAME_REQUEST, handleReclaimNameRequest)
yield takeEvery(FETCH_EXTERNAL_NAMES_REQUEST, handleFetchExternalNamesRequest)
yield takeEvery(CONNECT_WALLET_SUCCESS, handleConnectWallet)
+ yield takeEvery(SET_ENS_ADDRESS_REQUEST, handleSetENSAddressRequest)
function* handleFetchLandsSuccess() {
yield put(fetchENSAuthorizationRequest())
@@ -117,6 +122,8 @@ export function* ensSaga(builderClient: BuilderClient, ensApi: ENSApi) {
const owner = ownerAddress.toLowerCase()
const tokenId = nftTokenId.toString()
+ const ensResolverContract = ENSResolver__factory.connect(ENS_RESOLVER_ADDRESS, signer)
+ const ensAddressRecord: string = yield call([ensResolverContract, 'addr(bytes32)'], nodehash)
if (resolverAddress.toString() === ethers.constants.AddressZero) {
yield put(
@@ -127,54 +134,61 @@ export function* ensSaga(builderClient: BuilderClient, ensApi: ENSApi) {
nftOwnerAddress: address,
subdomain,
resolver: ethers.constants.AddressZero,
- content: ethers.constants.AddressZero
+ content: ethers.constants.AddressZero,
+ ensAddressRecord
})
)
return
}
- const resolverContract = ENSResolver__factory.connect(resolverAddress, signer)
+ let currentContent = ''
- const [x, y] = getCenter(getSelection(land))
+ if (land) {
+ const resolverContract = ENSResolver__factory.connect(resolverAddress, signer)
- const { ipfsHash, contentHash }: LandHashes = yield call(
- [builderClient, 'createLandRedirectionFile'],
- { x, y },
- getCurrentLocale().locale
- )
+ const [x, y] = getCenter(getSelection(land))
- const currentContent: string = yield call([resolverContract, 'contenthash'], nodehash)
- if (currentContent === ethers.constants.AddressZero) {
- yield put(
- fetchENSSuccess({
- name,
- tokenId,
- ensOwnerAddress: owner,
- nftOwnerAddress: address,
- subdomain,
- resolver: resolverAddress.toString(),
- content: ethers.constants.AddressZero,
- ipfsHash
- })
+ const { ipfsHash, contentHash }: LandHashes = yield call(
+ [builderClient, 'createLandRedirectionFile'],
+ { x, y },
+ getCurrentLocale().locale
)
- return
- }
- if (`0x${contentHash}` === currentContent) {
- yield put(
- fetchENSSuccess({
- name,
- tokenId,
- ensOwnerAddress: owner,
- nftOwnerAddress: address,
- subdomain,
- resolver: ENS_RESOLVER_ADDRESS,
- content: contentHash,
- ipfsHash,
- landId: land.id
- })
- )
- return
+ currentContent = yield call([resolverContract, 'contenthash'], nodehash)
+ if (currentContent === ethers.constants.AddressZero) {
+ yield put(
+ fetchENSSuccess({
+ name,
+ tokenId,
+ ensOwnerAddress: owner,
+ nftOwnerAddress: address,
+ subdomain,
+ resolver: resolverAddress.toString(),
+ content: ethers.constants.AddressZero,
+ ipfsHash,
+ ensAddressRecord
+ })
+ )
+ return
+ }
+
+ if (`0x${contentHash}` === currentContent) {
+ yield put(
+ fetchENSSuccess({
+ name,
+ tokenId,
+ ensOwnerAddress: owner,
+ nftOwnerAddress: address,
+ subdomain,
+ resolver: ENS_RESOLVER_ADDRESS,
+ content: contentHash,
+ ipfsHash,
+ landId: land.id,
+ ensAddressRecord
+ })
+ )
+ return
+ }
}
yield put(
@@ -186,7 +200,8 @@ export function* ensSaga(builderClient: BuilderClient, ensApi: ENSApi) {
subdomain,
resolver: ENS_RESOLVER_ADDRESS,
content: currentContent ?? ethers.constants.AddressZero,
- landId: ''
+ landId: '',
+ ensAddressRecord
})
)
} catch (error) {
@@ -304,6 +319,25 @@ export function* ensSaga(builderClient: BuilderClient, ensApi: ENSApi) {
}
}
+ function* handleSetENSAddressRequest(action: SetENSAddressRequestAction) {
+ const { ens, address } = action.payload
+ try {
+ const wallet: Wallet = yield call(getWallet)
+ const signer: ethers.Signer = yield call(getSigner)
+ const nodehash = namehash(ens.subdomain)
+ const resolverContract = ENSResolver__factory.connect(ENS_RESOLVER_ADDRESS, signer)
+
+ const transaction: ethers.ContractTransaction = yield call([resolverContract, 'setAddr(bytes32,address)'], nodehash, address)
+
+ yield put(setENSAddressSuccess(ens, address, wallet.chainId, transaction.hash))
+ yield call(waitForTx, transaction.hash)
+ yield put(closeModal('EnsMapAddressModal'))
+ } catch (error) {
+ const ensError: ENSError = { message: error.message, code: error.code, origin: ENSOrigin.ADDRESS }
+ yield put(setENSAddressFailure(ens, address, ensError))
+ }
+ }
+
function* handleFetchAuthorizationRequest(_action: FetchENSAuthorizationRequestAction) {
try {
const from: string = yield select(getAddress)
@@ -377,6 +411,7 @@ export function* ensSaga(builderClient: BuilderClient, ensApi: ENSApi) {
let landId: string | undefined = undefined
let content = ''
let worldStatus = null
+ let ensAddressRecord = ''
const nodehash = namehash(subdomain)
const [resolverAddress, owner, tokenId]: [string, string, string] = await Promise.all([
@@ -386,6 +421,14 @@ export function* ensSaga(builderClient: BuilderClient, ensApi: ENSApi) {
])
const resolver = resolverAddress.toString()
+ try {
+ const resolverContract = ENSResolver__factory.connect(ENS_RESOLVER_ADDRESS, signer)
+ const resolvedAddress = await resolverContract['addr(bytes32)'](nodehash)
+ ensAddressRecord = resolvedAddress !== ethers.constants.AddressZero ? resolvedAddress : ''
+ } catch (e) {
+ console.error('Failed to fetch ens address record')
+ }
+
if (resolver !== ethers.constants.AddressZero) {
try {
const resolverContract = ENSResolver__factory.connect(resolverAddress, signer)
@@ -426,6 +469,7 @@ export function* ensSaga(builderClient: BuilderClient, ensApi: ENSApi) {
subdomain,
resolver,
content,
+ ensAddressRecord,
landId,
worldStatus
}
diff --git a/src/modules/ens/selectors.spec.ts b/src/modules/ens/selectors.spec.ts
index 5df800da2..2f6087244 100644
--- a/src/modules/ens/selectors.spec.ts
+++ b/src/modules/ens/selectors.spec.ts
@@ -1,6 +1,9 @@
import { RootState } from 'modules/common/types'
-import { getExternalNames, getExternalNamesForConnectedWallet, getExternalNamesForWallet } from './selectors'
+import { TransactionState } from 'decentraland-dapps/dist/modules/transaction/reducer'
+import { Transaction, TransactionStatus } from 'decentraland-dapps/dist/modules/transaction/types'
+import { getExternalNames, getExternalNamesForConnectedWallet, getExternalNamesForWallet, isWaitingTxSetAddress } from './selectors'
import { ENSState } from './reducer'
+import { SET_ENS_ADDRESS_SUCCESS, SET_ENS_CONTENT_SUCCESS } from './actions'
let state: RootState
let wallet1: string
@@ -109,3 +112,75 @@ describe('when getting the external names for a provided wallet', () => {
})
})
})
+
+describe('when using isWaitingTxSetAddress selector', () => {
+ describe('and there are no pending transactions', () => {
+ beforeEach(() => {
+ state = {
+ transaction: { data: [], loading: [], error: null } as TransactionState,
+ wallet: {
+ data: {
+ address: wallet1
+ }
+ }
+ } as RootState
+ })
+ it('should return false', () => {
+ expect(isWaitingTxSetAddress(state)).toEqual(false)
+ })
+ })
+
+ describe('and there are pending transactions', () => {
+ describe('and the transaction actionType is SET_ENS_ADDRESS_SUCCESS', () => {
+ beforeEach(() => {
+ state = {
+ transaction: {
+ data: [
+ {
+ actionType: SET_ENS_ADDRESS_SUCCESS,
+ status: TransactionStatus.PENDING,
+ from: wallet1
+ } as Transaction
+ ],
+ loading: [],
+ error: null
+ } as TransactionState,
+ wallet: {
+ data: {
+ address: wallet1
+ }
+ }
+ } as RootState
+ })
+ it('should return true', () => {
+ expect(isWaitingTxSetAddress(state)).toEqual(true)
+ })
+ })
+
+ describe('and the transaction actionType is not SET_ENS_ADDRESS_SUCCESS', () => {
+ beforeEach(() => {
+ state = {
+ transaction: {
+ data: [
+ {
+ actionType: SET_ENS_CONTENT_SUCCESS,
+ status: TransactionStatus.PENDING,
+ from: wallet1
+ } as Transaction
+ ],
+ loading: [],
+ error: null
+ } as TransactionState,
+ wallet: {
+ data: {
+ address: wallet1
+ }
+ }
+ } as RootState
+ })
+ it('should return false', () => {
+ expect(isWaitingTxSetAddress(state)).toEqual(false)
+ })
+ })
+ })
+})
diff --git a/src/modules/ens/selectors.ts b/src/modules/ens/selectors.ts
index 5390b321f..1e73210e7 100644
--- a/src/modules/ens/selectors.ts
+++ b/src/modules/ens/selectors.ts
@@ -15,7 +15,8 @@ import {
ALLOW_CLAIM_MANA_SUCCESS,
RECLAIM_NAME_SUCCESS,
CLAIM_NAME_REQUEST,
- CLAIM_NAME_TRANSACTION_SUBMITTED
+ CLAIM_NAME_TRANSACTION_SUBMITTED,
+ SET_ENS_ADDRESS_SUCCESS
} from './actions'
import { Authorization, ENS } from './types'
import { ENSState } from './reducer'
@@ -95,6 +96,10 @@ export const isWaitingTxSetResolver = createSelector SET_ENS_RESOLVER_SUCCESS === transaction.actionType)
)
+export const isWaitingTxSetAddress = createSelector(getPendingTransactions, transactions =>
+ transactions.some(transaction => SET_ENS_ADDRESS_SUCCESS === transaction.actionType)
+)
+
export const isWaitingTxSetLandContent = (state: RootState, landId: string) =>
getPendingTransactions(state).some(
transaction => SET_ENS_CONTENT_SUCCESS === transaction.actionType && transaction.payload.land.id === landId
diff --git a/src/modules/ens/types.ts b/src/modules/ens/types.ts
index fbb8b1c49..6fa4fb475 100644
--- a/src/modules/ens/types.ts
+++ b/src/modules/ens/types.ts
@@ -20,6 +20,8 @@ export type ENS = {
landId?: string
worldStatus?: WorldStatus | null
+
+ ensAddressRecord?: string
}
export type ENSError = {
@@ -30,7 +32,8 @@ export type ENSError = {
export enum ENSOrigin {
RESOLVER = 'Resolver',
- CONTENT = 'Content'
+ CONTENT = 'Content',
+ ADDRESS = 'Address'
}
export type Authorization = {
diff --git a/src/modules/features/selectors.spec.ts b/src/modules/features/selectors.spec.ts
index ea34a42d2..c04c47c77 100644
--- a/src/modules/features/selectors.spec.ts
+++ b/src/modules/features/selectors.spec.ts
@@ -7,7 +7,8 @@ import {
getIsMaintenanceEnabled,
getIsSDK7TemplatesEnabled,
getIsWorldsForEnsOwnersEnabled,
- getIsNavbarV2Enabled
+ getIsNavbarV2Enabled,
+ getIsEnsAddressEnabled
} from './selectors'
import { FeatureName } from './types'
@@ -65,7 +66,8 @@ const ffSelectors = [
{ selector: getIsSDK7TemplatesEnabled, app: ApplicationName.BUILDER, feature: FeatureName.SDK7_TEMPLATES },
{ selector: getIsCreateSceneOnlySDK7Enabled, app: ApplicationName.BUILDER, feature: FeatureName.CREATE_SCENE_ONLY_SDK7 },
{ selector: getIsAuthDappEnabled, app: ApplicationName.DAPPS, feature: FeatureName.AUTH_DAPP },
- { selector: getIsNavbarV2Enabled, app: ApplicationName.DAPPS, feature: FeatureName.NAVBAR_V2 }
+ { selector: getIsNavbarV2Enabled, app: ApplicationName.DAPPS, feature: FeatureName.NAVBAR_V2 },
+ { selector: getIsEnsAddressEnabled, app: ApplicationName.DAPPS, feature: FeatureName.ENS_ADDRESS }
]
ffSelectors.forEach(({ selector, app, feature }) => {
diff --git a/src/modules/features/selectors.ts b/src/modules/features/selectors.ts
index e90b80aab..8a002e30c 100644
--- a/src/modules/features/selectors.ts
+++ b/src/modules/features/selectors.ts
@@ -85,3 +85,11 @@ export const getIsNavbarV2Enabled = (state: RootState) => {
return false
}
}
+
+export const getIsEnsAddressEnabled = (state: RootState) => {
+ try {
+ return getIsFeatureEnabled(state, ApplicationName.DAPPS, FeatureName.ENS_ADDRESS)
+ } catch (e) {
+ return false
+ }
+}
diff --git a/src/modules/features/types.ts b/src/modules/features/types.ts
index c189c8517..502cab6d2 100644
--- a/src/modules/features/types.ts
+++ b/src/modules/features/types.ts
@@ -10,5 +10,6 @@ export enum FeatureName {
SDK7_TEMPLATES = 'sdk7-templates',
CREATE_SCENE_ONLY_SDK7 = 'create-scene-only-sdk7',
AUTH_DAPP = 'auth-dapp',
- NAVBAR_V2 = 'navbar2_variant'
+ NAVBAR_V2 = 'navbar2_variant',
+ ENS_ADDRESS = 'ens-address'
}
diff --git a/src/modules/location/selectors.spec.ts b/src/modules/location/selectors.spec.ts
index d5fe7bad8..994834dfd 100644
--- a/src/modules/location/selectors.spec.ts
+++ b/src/modules/location/selectors.spec.ts
@@ -2,7 +2,7 @@ import { getData } from 'decentraland-dapps/dist/modules/wallet/selectors'
import { RootState } from 'modules/common/types'
import { Item, ItemType } from 'modules/item/types'
import { locations } from 'routing/locations'
-import { getCollectionId, getSelectedItemId, getTemplateId } from './selectors'
+import { getCollectionId, getSelectedItemId, getTemplateId, getENSName } from './selectors'
jest.mock('decentraland-dapps/dist/modules/wallet/selectors')
@@ -323,3 +323,19 @@ describe('when getting the selected item id using the current url', () => {
})
})
})
+
+describe('when getting the name from the current url', () => {
+ it('should return the name section of the url', () => {
+ const name = 'test'
+ const mockState = {
+ router: {
+ action: 'POP',
+ location: {
+ pathname: locations.ensDetail(name)
+ }
+ }
+ } as unknown
+
+ expect(getENSName(mockState as RootState)).toEqual(name)
+ })
+})
diff --git a/src/modules/location/selectors.ts b/src/modules/location/selectors.ts
index 078928d30..78c9af075 100644
--- a/src/modules/location/selectors.ts
+++ b/src/modules/location/selectors.ts
@@ -85,3 +85,15 @@ export const getSelectedCollectionId = (state: RootState) => new URLSearchParams
export const isReviewing = (state: RootState) => !!new URLSearchParams(getSearch(state)).get('reviewing')
export const getState = (state: RootState) => state.location
export const hasHistory = (state: RootState) => getState(state).hasHistory
+
+export const ensNameMatchSelector = createMatchSelector<
+ RootState,
+ {
+ name: string
+ }
+>(locations.ensDetail())
+
+export const getENSName = (state: RootState) => {
+ const result = ensNameMatchSelector(state)
+ return result ? result.params.name : null
+}
diff --git a/src/modules/translation/languages/en.json b/src/modules/translation/languages/en.json
index a316820d0..618a9f9ce 100644
--- a/src/modules/translation/languages/en.json
+++ b/src/modules/translation/languages/en.json
@@ -577,23 +577,59 @@
"subtitle": "Your are editing {name}."
},
"ens_list_page": {
+ "title": "NAMEs",
+ "sort_by": "Sort by",
+ "mint_name": "Mint name",
+ "result": "{count} {count, plural, one {result} other {results}}",
+ "edit": "Edit",
+ "transfer": "Transfer",
"table": {
"name": "Name",
"link": "Link",
- "assigned_to": "Assigned To"
+ "assigned_to": "Assigned To",
+ "address": "Address",
+ "alias": "Alias",
+ "land": "Land",
+ "actions": "Actions",
+ "you": "you"
},
"assigned_to_land": "Land ({landId})",
"assigned_to_estate": "Estate ({landId})",
"button": {
"assign": "Use as Link",
"edit": "Edit Link",
- "use_as_alias": "Use as Alias"
+ "use_as_alias": "Use as Alias",
+ "add_to_avatar": "Add to Avatar",
+ "link_to_address": "Link to an Ethereum Address",
+ "assign_to_land": "Assign to Land or World"
},
"empty_names": "It looks like you don't have any Names.{br} {link} to get started.",
"items": "{count} {count, plural, one {result} other {results}}",
"alias_popup": "This name is being used by your profile but it can still be assigned",
"not_profile_created": "You need to get into the world first to set an alias."
},
+ "ens_detail_page": {
+ "name": "Name",
+ "address": "Address",
+ "alias": "Alias",
+ "land": "Land",
+ "unassign": "Unassigned",
+ "set_as_primary": "Set as primary",
+ "edit_address": "Edit address"
+ },
+ "ens_map_address_modal": {
+ "title": "Link to an Ethereum Address",
+ "description": "Enable others to reference your account by defining an Ethereum address with your Decentraland NAME. This allows you to receive assets simply by providing your NAME.",
+ "address": {
+ "label": "Linked Ethereum Address",
+ "placeholder": "Address"
+ },
+ "network": "Network",
+ "ethereum": "Ethereum Mainnet Network",
+ "error_title": "An error occur while setting the address",
+ "learn_more": "Learn more",
+ "save": "Save"
+ },
"worlds_list_page": {
"table": {
"name": "NAME",
diff --git a/src/modules/translation/languages/es.json b/src/modules/translation/languages/es.json
index 28414117f..4399f024a 100644
--- a/src/modules/translation/languages/es.json
+++ b/src/modules/translation/languages/es.json
@@ -579,23 +579,59 @@
"unpublish_needed": "Por favor Despublica tu Escena antes de actualizar los detalles de la misma"
},
"ens_list_page": {
+ "title": "Nombres",
+ "sort_by": "Ordernar por",
+ "mint_name": "Comprar nombre",
+ "result": "{count} {count, plural, one {resultado} other {resultados}}",
+ "edit": "Editar",
+ "transfer": "Transferir",
"table": {
"name": "Nombre",
"link": "Enlace",
- "assigned_to": "Asignado a"
+ "assigned_to": "Asignado a",
+ "address": "Dirección",
+ "alias": "alias",
+ "land": "Tierra",
+ "actions": "Acciones",
+ "you": "tú"
},
"assigned_to_land": "Tierra ({landId})",
"assigned_to_estate": "Estate ({landId})",
"button": {
"assign": "Usar como link",
"edit": "Editar link",
- "use_as_alias": "Usar como alias"
+ "use_as_alias": "Usar como alias",
+ "add_to_avatar": "Agregar a Avatar",
+ "link_to_address": "Enlazar a una dirección de Ethereum",
+ "assign_to_land": "Asignar a tierra o mundo"
},
"empty_names": "No tienes ningun nombre aún.{br} {link} para comenzar.",
"items": "{count} {count, plural, one {resultado} other {resultados}}",
"alias_popup": "Este nombre está siendo usado por tu perfil pero igual puede ser asignado",
"not_profile_created": "Primero necesitas entrar en el mundo antes de asignar un alias."
},
+ "ens_detail_page": {
+ "name": "Nombre",
+ "address": "Dirección",
+ "alias": "Alias",
+ "land": "Tierra",
+ "unassign": "Sin asignar",
+ "set_as_primary": "Usar como alias",
+ "edit_address": "Editar dirección"
+ },
+ "ens_map_address_modal": {
+ "title": "Enlace a una dirección de Ethereum",
+ "description": "Permita que otros hagan referencia a su cuenta definiendo una dirección de Ethereum con su nombre Decentraland. Esto le permite recibir activos simplemente proporcionando su nombre.",
+ "address": {
+ "label": "Dirección de Ethereum vinculada",
+ "placeholder": "DIRECCIÓN"
+ },
+ "network": "Red",
+ "ethereum": "Ethereum Mainnet",
+ "error_title": "Se produjo un error al configurar la dirección",
+ "learn_more": "Aprende más",
+ "save": "Guardar"
+ },
"worlds_list_page": {
"table": {
"name": "NOMBRE",
diff --git a/src/modules/translation/languages/zh.json b/src/modules/translation/languages/zh.json
index f592408fd..4090324fc 100644
--- a/src/modules/translation/languages/zh.json
+++ b/src/modules/translation/languages/zh.json
@@ -581,23 +581,59 @@
"title": "糟糕！"
},
"ens_list_page": {
+ "title": "名称",
+ "sort_by": "排序方式",
+ "mint_name": "薄荷名称",
+ "result": "{count} {count, plural, one {结果} other {结果}}",
+ "edit": "编辑",
+ "transfer": "转移",
"table": {
"name": "名称",
"link": "链接",
- "assigned_to": "分配给"
+ "assigned_to": "分配给",
+ "address": "地址",
+ "alias": "别名",
+ "land": "土地",
+ "actions": "动作",
+ "you": "你"
},
"assigned_to_land": "土地 ({landId})",
"assigned_to_estate": "州 ({landId})",
"button": {
"assign": "分配",
"edit": "修",
- "use_as_alias": "用作别名"
+ "use_as_alias": "用作别名",
+ "add_to_avatar": "添加到头像",
+ "link_to_address": "链接到以太坊地址",
+ "assign_to_land": "分配土地或世界"
},
"empty_names": "看来您没有任何名称。{br} {link}开始使用。",
"items": "{count}结果",
"alias_popup": "您的个人资料正在使用此名称，但仍可以分配",
"not_profile_created": "您需要先进入世界才能设置别名。"
},
+ "ens_detail_page": {
+ "name": "姓名",
+ "address": "地址",
+ "alias": "别名",
+ "land": "土地",
+ "unassign": "未分配",
+ "set_as_primary": "设置为主要",
+ "edit_address": "编辑地址"
+ },
+ "ens_map_address_modal": {
+ "title": "链接到以太坊地址",
+ "description": "通过定义您的分散名称来定义以太坊地址，使其他人可以参考您的帐户。这使您只需提供姓名即可获得资产。",
+ "address": {
+ "label": "链接的以太坊地址",
+ "placeholder": "地址"
+ },
+ "network": "网络",
+ "ethereum": "以太坊主网网络",
+ "error_title": "设置地址时发生错误",
+ "learn_more": "了解更多",
+ "save": "节省"
+ },
"worlds_list_page": {
"table": {
"name": "姓名",
diff --git a/src/routing/Routes.tsx b/src/routing/Routes.tsx
index 53d27b9ee..1843749f4 100644
--- a/src/routing/Routes.tsx
+++ b/src/routing/Routes.tsx
@@ -30,6 +30,7 @@ const LandDetailPage = React.lazy(() => import('components/LandDetailPage'))
const LandTransferPage = React.lazy(() => import('components/LandTransferPage'))
const LandEditPage = React.lazy(() => import('components/LandEditPage'))
const ENSListPage = React.lazy(() => import('components/ENSListPage'))
+const ENSDetailPage = React.lazy(() => import('components/ENSDetailPage'))
const WorldListPage = React.lazy(() => import('components/WorldListPage'))
const WorldListPageWorldsForEnsOwners = React.lazy(() => import('components/WorldListPage_WorldsForEnsOwnersFeature'))
const LandSelectENSPage = React.lazy(() => import('components/LandSelectENSPage'))
@@ -126,6 +127,7 @@ export default class Routes extends React.Component {
, flatten(locales.en))
+export function renderWithProviders(
+ component: JSX.Element,
+ { preloadedState, store }: { preloadedState?: Partial; store?: Store } = {}
+) {
+ const initializedStore =
+ store ||
+ initTestStore({
+ ...(preloadedState || {}),
+ storage: { loading: false },
+ translation: {
+ data: {
+ en: allTranslations,
+ 'en-EN': allTranslations
+ },
+ locale: 'en-EN'
+ }
+ })
+
+ const history = createMemoryHistory()
+
+ function AppProviders({ children }: { children: JSX.Element }) {
+ return (
+
+
+ {children}
+
+
+ )
+ }
+
+ return render(component, { wrapper: AppProviders })
+}
diff --git a/src/themes/components/CopyToClipboard.css b/src/themes/components/CopyToClipboard.css
index 0bc74c1a0..e42d337cb 100644
--- a/src/themes/components/CopyToClipboard.css
+++ b/src/themes/components/CopyToClipboard.css
@@ -6,3 +6,20 @@
opacity: 0;
transition: opacity 0.5s ease-out;
}
+
+.copy-to-clipboard i {
+ background: #43404a;
+ width: 25px;
+ height: 25px;
+ font-size: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 50%;
+ color: white;
+ cursor: pointer;
+}
+
+.copy-to-clipboard:hover i {
+ background: #555459;
+}
+
+
+ {totalPages > 1 && (
+ this.setState({ page: +props.activePage! })}
+ />
+ )}
+
+ )
+ }
+
render() {
- const { isLoading, error } = this.props
+ const { isLoading, isEnsAddressEnabled, error } = this.props
return (
+
+
+
+ {t('ens_list_page.title')}
+ {t('ens_list_page.result', { count: ensList.length })} +
+
+
+ {t('ens_list_page.sort_by')} {ensList.length > 1 ? this.renderSortDropdown() : null}
+
+
+ 
+ ) : (
+
+
+
+ )
+}
diff --git a/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.types.ts b/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.types.ts
new file mode 100644
index 000000000..297a211bc
--- /dev/null
+++ b/src/components/Modals/ENSMapAddressModal/ENSMapAddressModal.types.ts
@@ -0,0 +1,14 @@
+import { ModalProps } from 'decentraland-ui'
+import { Dispatch } from 'redux'
+import { SetENSAddressRequestAction } from 'modules/ens/actions'
+
+export type Props = ModalProps & {
+ error: string | null
+ isLoading: boolean
+ onSave: (address: string) => void
+}
+
+export type MapStateProps = Pick
+
+ {t('ens_map_address_modal.title')}
+ {t('ens_map_address_modal.description')} +
+
+ {error &&
+ {t('ens_map_address_modal.network')}
+
+
+ {t('ens_map_address_modal.ethereum')}
+
+
+
+
+
+
+