Skip to content

Commit

Permalink
feat: bump dcl dapps and schemas to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
juanmahidalgo committed Feb 15, 2024
1 parent cefae65 commit 5389278
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 28 deletions.
70 changes: 50 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@dcl/crypto": "^3.4.5",
"@dcl/hashing": "^3.0.4",
"@dcl/mini-rpc": "^1.0.7",
"@dcl/schemas": "^9.14.0",
"@dcl/schemas": "^10.2.1",
"@dcl/sdk": "^7.4.0",
"@dcl/single-sign-on-client": "^0.1.0",
"@dcl/ui-env": "^1.5.0",
Expand All @@ -37,7 +37,7 @@
"decentraland": "3.3.0",
"decentraland-builder-scripts": "^0.24.0",
"decentraland-crypto-fetch": "^2.0.1",
"decentraland-dapps": "^18.1.0",
"decentraland-dapps": "^18.2.1",
"decentraland-ecs": "6.12.4-7784644013.commit-f770b3e",
"decentraland-experiments": "^1.0.2",
"decentraland-transactions": "^2.0.3",
Expand Down Expand Up @@ -156,4 +156,4 @@
"decentraland-ecs": "6.12.4-7784644013.commit-f770b3e",
"decentraland": "3.3.0"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { ModalNavigation, Field, Button, Form } from 'decentraland-ui'
import { ContractName } from 'decentraland-transactions'
import { NFTCategory, Network } from '@dcl/schemas'
import { Contract, NFTCategory, Network } from '@dcl/schemas'
import { getChainIdByNetwork } from 'decentraland-dapps/dist/lib/eth'
import { AuthorizationType } from 'decentraland-dapps/dist/modules/authorization/types'
import Modal from 'decentraland-dapps/dist/containers/Modal'
Expand All @@ -20,7 +20,7 @@ export default class ClaimNameFatFingerModal extends React.PureComponent<Props,
const { onClaim, onAuthorizedAction, onClaimNameClear } = this.props
const { currentName } = this.state

const manaContract = {
const manaContract: Contract = {
name: ContractName.MANAToken,
address: MANA_ADDRESS,
chainId: getChainIdByNetwork(Network.ETHEREUM),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { withAuthorizedAction } from 'decentraland-dapps/dist/containers'
import { AuthorizedAction } from 'decentraland-dapps/dist/containers/withAuthorizedAction/AuthorizationModal'
import { ContractName } from 'decentraland-transactions'
import { AuthorizationType } from 'decentraland-dapps/dist/modules/authorization/types'
import { NFTCategory, Network } from '@dcl/schemas'
import { Contract, NFTCategory, Network } from '@dcl/schemas'
import { buildManaAuthorization } from 'lib/mana'
import { getPublishStatus, getError } from 'modules/collection/selectors'
import { Props, PublishWizardCollectionSteps } from './PublishWizardCollectionModal.types'
Expand Down Expand Up @@ -74,7 +74,7 @@ export const PublishWizardCollectionModal: React.FC<Props> = props => {

const handleOnPublish = () => {
const authorization = buildManaAuthorization(wallet.address, wallet.networks.MATIC.chainId, ContractName.CollectionManager)
const manaContract = {
const manaContract: Contract = {
name: authorization.contractName,
address: authorization.contractAddress,
chainId: authorization.chainId,
Expand Down
4 changes: 3 additions & 1 deletion src/modules/wallet/selectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import { RootState } from 'modules/common/types'

export function getManaBalanceForNetwork(state: RootState, network: Network): number {
const networks = getNetworks(state)
return networks && networks[network] && networks[network].mana ? networks[network].mana : 0
return networks && (network === Network.ETHEREUM || network === Network.MATIC) && networks[network] && networks[network].mana
? networks[network].mana
: 0
}

export const getWallet = createSelector<RootState, Wallet | null, Wallet | null>(getData, wallet =>
Expand Down

0 comments on commit 5389278

Please sign in to comment.