Skip to content

Commit

Permalink
fix: Merge branch 'fix/refactor-buy-with-crypto-modal' into feat/mint…
Browse files Browse the repository at this point in the history
…-name-with-crypto-modal
  • Loading branch information
fzavalia committed Feb 20, 2024
2 parents 65519c3 + e25a572 commit d39194e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { ChainId } from '@dcl/schemas'
import { Wallet } from 'decentraland-dapps/dist/modules/wallet/types'
import type { CrossChainProvider, Route, Token } from 'decentraland-transactions/crossChain'
import { openBuyManaWithFiatModalRequest } from 'decentraland-dapps/dist/modules/gateway/actions'
Expand All @@ -6,7 +7,6 @@ import { switchNetworkRequest } from 'decentraland-dapps/dist/modules/wallet/act
import { ModalProps } from 'decentraland-dapps/dist/providers/ModalProvider/ModalProvider.types'
import { Asset } from '../../../modules/asset/types'
import { CrossChainRoute, GasCost } from './hooks'
import { ChainId } from '@dcl/schemas'

export type MapStateProps = Pick<
Props,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,6 @@
width: 100% !important; /* semantic ui has auto!important; */
}

/* .tokenDropdownContainer {
display: flex;
flex: 1;
flex-direction: column;
align-self: flex-end;
justify-content: center;
} */

.costContainer {
margin-top: 12px;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { useCallback, useMemo } from 'react'
import { ethers } from 'ethers'
import classNames from 'classnames'
import { Network } from '@dcl/schemas'
import { ChainId, getNetwork } from '@dcl/schemas/dist/dapps/chain-id'
import { useCallback, useMemo } from 'react'
import classNames from 'classnames'
import { t } from 'decentraland-dapps/dist/modules/translation'
import { Wallet } from 'decentraland-dapps/dist/modules/wallet/types'
import { ChainData, Route, Token } from 'decentraland-transactions/crossChain'
import { Icon, InfoTooltip } from 'decentraland-ui'
import { ManaToFiat } from '../../../ManaToFiat'
import { formatPrice } from '../utils'
import { GasCostValues, RouteFeeCost } from '../hooks'
import styles from './PaymentSelector.module.css'
import type { ChainData, Route, Token } from "decentraland-transactions/crossChain"
import { Icon, InfoTooltip } from "decentraland-ui"
import { ManaToFiat } from "../../../ManaToFiat"
import { formatPrice } from "../utils"
import type { GasCostValues, RouteFeeCost } from "../hooks"
import styles from "./PaymentSelector.module.css"

export const PAY_WITH_DATA_TEST_ID = 'pay-with-container'
export const CHAIN_SELECTOR_DATA_TEST_ID = 'chain-selector'
Expand Down

0 comments on commit d39194e

Please sign in to comment.