Skip to content

Commit

Permalink
fix: Review fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
LautaroPetaccio committed Feb 22, 2024
1 parent 73b06c9 commit cc9acb7
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 24 deletions.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import { MintNameWithCryptoModal } from './MintNameWithCryptoModal'

const mapState = (state: RootState): MapStateProps => {
return {
isClaimingName: isLoadingType(getLoading(state), CLAIM_NAME_REQUEST),
isClaimingNameCrossChain: isLoadingType(
isMintingName: isLoadingType(getLoading(state), CLAIM_NAME_REQUEST),
isMintingNameCrossChain: isLoadingType(
getLoading(state),
CLAIM_NAME_CROSS_CHAIN_REQUEST
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export const CONTROLLER_V2_ADDRESS = config.get(
const MintNameWithCryptoModalHOC = (props: Props) => {
const {
name: modalName,
isClaimingName,
isClaimingNameCrossChain,
isMintingName,
isMintingNameCrossChain,
metadata: { name },
isLoadingAuthorization,
getContract,
Expand Down Expand Up @@ -137,8 +137,8 @@ const MintNameWithCryptoModalHOC = (props: Props) => {
return (
<BuyWithCryptoModal
price={PRICE_IN_WEI}
isBuyingAsset={isClaimingName}
isBuyingCrossChain={isClaimingNameCrossChain}
isBuyingAsset={isMintingName}
isBuyingCrossChain={isMintingNameCrossChain}
onBuyNatively={onBuyNatively}
onBuyCrossChain={onClaimNameCrossChain}
onGetGasCost={onGetGasCost}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import { claimNameRequest } from '../../../../modules/ens/actions'

export type Props = WithAuthorizedActionProps & Omit<ModalProps, 'metadata'> & {
metadata: { name: string }
isClaimingName: boolean
isClaimingNameCrossChain: boolean
isMintingName: boolean
isMintingNameCrossChain: boolean
getContract: (query: Partial<Contract>) => ReturnType<typeof getContract>
onClaimName: typeof claimNameRequest
onOpenFatFingerModal: () => unknown
onClaimNameCrossChain: (route: Route) => unknown
}

export type MapStateProps = Pick<Props, 'getContract' | 'isClaimingName' | 'isClaimingNameCrossChain'>
export type MapStateProps = Pick<Props, 'getContract' | 'isMintingName' | 'isMintingNameCrossChain'>
export type MapDispatchProps = Pick<
Props,
'onClaimName' | 'onClaimNameCrossChain' | 'onOpenFatFingerModal'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { getContract } from '../../../modules/contract/selectors'
import { getMana, getWallet } from '../../../modules/wallet/selectors'
import {
getIsClaimingNamesWithFiatEnabled,
getIsMintingNamesWithAxelarEnabled
getIsMintingNamesCrossChainEnabled
} from '../../../modules/features/selectors'
import {
MapDispatch,
Expand All @@ -46,7 +46,7 @@ const mapState = (state: RootState): MapState => ({
address: getAddress(state),
getContract: (query: Partial<Contract>) => getContract(state, query),
wallet: getWallet(state),
isClaimingNamesWithAxelarEnabled: getIsMintingNamesWithAxelarEnabled(state),
isClaimingNamesCrossChainEnabled: getIsMintingNamesCrossChainEnabled(state),
isClaimingNamesWithFiatEnabled: getIsClaimingNamesWithFiatEnabled(state)
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('ClaimNameFatFingerModal', () => {
const onClaimTxSubmittedMock = jest.fn()
const baseProps = {
currentMana: 0,
isClaimingNamesWithAxelarEnabled: false,
isClaimingNamesCrossChainEnabled: false,
onBuyWithCrypto: onBuyWithCryptoMock,
identity: {} as AuthIdentity,
onClaimTxSubmitted: onClaimTxSubmittedMock,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const ClaimNameFatFingerModal = ({
metadata: { name: ENSName, autoComplete },
isLoading: isClaiming,
isClaimingNamesWithFiatEnabled,
isClaimingNamesWithAxelarEnabled,
isClaimingNamesCrossChainEnabled,
onClaim,
onBuyWithCrypto,
onAuthorizedAction,
Expand Down Expand Up @@ -243,7 +243,7 @@ const ClaimNameFatFingerModal = ({
onClose={isLoading ? undefined : onClose}
/>
<Form
onSubmit={!isClaimingNamesWithAxelarEnabled ? handleClaim : undefined}
onSubmit={!isClaimingNamesCrossChainEnabled ? handleClaim : undefined}
>
<Modal.Content>
<div className="details">
Expand Down Expand Up @@ -276,7 +276,7 @@ const ClaimNameFatFingerModal = ({
<Icon name="info circle" />
{t('names_page.claim_name_fat_finger_modal.caps_warning')}
</div>
{!isClaimingNamesWithAxelarEnabled ? (
{!isClaimingNamesCrossChainEnabled ? (
<div>
<span className="payWith payWithTitle">
{t('names_page.claim_name_fat_finger_modal.paying_with')}
Expand Down Expand Up @@ -392,10 +392,10 @@ const ClaimNameFatFingerModal = ({
</Modal.Content>
<Modal.Actions
className={classNames(
isClaimingNamesWithAxelarEnabled && 'modalActions'
isClaimingNamesCrossChainEnabled && 'modalActions'
)}
>
{isClaimingNamesWithAxelarEnabled ? (
{isClaimingNamesCrossChainEnabled ? (
<>
<BuyWithCryptoButton
assetNetwork={Network.ETHEREUM}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export type Props = Omit<ModalProps, 'metadata'> & {
name: string
autoComplete?: boolean
}
isClaimingNamesWithAxelarEnabled: boolean
isClaimingNamesCrossChainEnabled: boolean
isClaimingNamesWithFiatEnabled: boolean
onClaim: typeof claimNameRequest
onBuyWithCrypto: typeof openModal
Expand All @@ -47,7 +47,7 @@ export type MapState = Pick<
| 'isLoading'
| 'wallet'
| 'currentMana'
| 'isClaimingNamesWithAxelarEnabled'
| 'isClaimingNamesCrossChainEnabled'
| 'isClaimingNamesWithFiatEnabled'
>
export type MapDispatchProps = Pick<
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/modules/ens/actions.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { action } from 'typesafe-actions'
import { ChainId } from '@dcl/schemas'
import { Route } from 'decentraland-transactions/crossChain'
import { buildTransactionPayload } from 'decentraland-dapps/dist/modules/transaction/utils'
import { ENS, ENSError } from './types'
import { Route } from 'decentraland-transactions/crossChain'

// Claim a new name
export const CLAIM_NAME_REQUEST = '[Request] Claim Name'
Expand Down
6 changes: 3 additions & 3 deletions webapp/src/modules/features/selectors.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
isLoadingFeatureFlags,
getIsClaimingNamesWithFiatEnabled,
getIsEnsAddressEnabled,
getIsMintingNamesWithAxelarEnabled,
getIsMintingNamesCrossChainEnabled,
getIsChainSelectorEnabled
} from './selectors'
import { FeatureName } from './types'
Expand Down Expand Up @@ -175,15 +175,15 @@ const waitForInitialLoadingSelectors = [
{
name: 'minting-names-with-axelar',
feature: FeatureName.MINTING_NAMES_WITH_AXELAR,
selector: getIsMintingNamesWithAxelarEnabled,
selector: getIsMintingNamesCrossChainEnabled,
applicationName: ApplicationName.MARKETPLACE
},
{
name: 'chain-selector',
feature: FeatureName.CHAIN_SELECTOR,
selector: getIsChainSelectorEnabled,
applicationName: ApplicationName.MARKETPLACE
},
}
]

waitForInitialLoadingSelectors.forEach(
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/modules/features/selectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export const getIsEnsAddressEnabled = (state: RootState) => {
return false
}

export const getIsMintingNamesWithAxelarEnabled = (state: RootState) => {
export const getIsMintingNamesCrossChainEnabled = (state: RootState) => {
return (
hasLoadedInitialFlags(state) &&
getIsFeatureEnabled(
Expand Down

0 comments on commit cc9acb7

Please sign in to comment.