Build has been set to done!

7975173206

Committed 20 Feb 2024 02:34PM UTC coverage: 65.747% (-1.3%) from 67.05%

Build # 7975173206

Build Type

push

github

Committed by

web-flow

Commit Message

fix: Refactor buy with crypto modal (#2130)

* fix: Refactor buy with crypto modal

* fix: Complete refactor

* fix: Loading correct modal

* fix: Use refactored modals

* fix: Tests

* fix: Casing

* fix: Removed old casing

* fix: Re-case

* fix: Remove old cased directory

* fix: Re-case

* fix: Little improvements

* fix: Move import

* fix: Remove comment

* fix: Update imports

* fix: Format file

* fix: Resolve conflicts manually

* fix: Update webapp/src/components/Modals/BuyWithCryptoModal/BuyWithCryptoModal.tsx

Co-authored-by: Juanma Hidalgo <juanma06@gmail.com>
Signed-off-by: Fernando Zavalia <24811313+fzavalia@users.noreply.github.com>

---------

Signed-off-by: Fernando Zavalia <24811313+fzavalia@users.noreply.github.com>
Co-authored-by: Nando <24811313+fzavalia@users.noreply.github.com>
Co-authored-by: Juanma Hidalgo <juanma06@gmail.com>

Run Details

2474 of 4881 branches covered (50.69%)

Branch coverage included in aggregate %.

100 of 230 new or added lines in 8 files covered. (43.48%)

41 existing lines in 6 files now uncovered.

7442 of 10201 relevant lines covered (72.95%)

70.4 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

72.73

/webapp/src/components/AssetPage/SaleActionBox/BuyNFTButtons/BuyNFTButtons.container.tsx

import { connect } from 'react-redux'
import { replace } from 'connected-react-router'
import { Order } from '@dcl/schemas'
import { openModal } from 'decentraland-dapps/dist/modules/modal/actions'
import { getOpenModals } from 'decentraland-dapps/dist/modules/modal/selectors'
import { isConnecting } from 'decentraland-dapps/dist/modules/wallet/selectors'
import {
  MapDispatchProps,
  MapDispatch,
  MapStateProps,
  OwnProps
} from './BuyNFTButtons.types'
import { executeOrderWithCardRequest } from '../../../../modules/order/actions'
import { buyItemWithCardRequest } from '../../../../modules/item/actions'
import { Asset, AssetType } from '../../../../modules/asset/types'
import { RootState } from '../../../../modules/reducer'
import { getWallet } from '../../../../modules/wallet/selectors'
import BuyNFTButtons from './BuyNFTButtons'

const mapState = (state: RootState): MapStateProps => ({
  wallet: getWallet(state),
  isConnecting: isConnecting(state),
  isBuyingWithCryptoModalOpen:
    getOpenModals(state)['BuyNftWithCryptoModal']?.open ||
    getOpenModals(state)['MintNftWithCryptoModal']?.open
})

const mapDispatch = (
  dispatch: MapDispatch,
  ownProps: OwnProps
): MapDispatchProps => ({
  onExecuteOrderWithCard: nft => dispatch(executeOrderWithCardRequest(nft)),
  onBuyWithCrypto: (asset: Asset, order?: Order | null) =>
    ownProps.assetType === AssetType.NFT
      ? dispatch(
          openModal('BuyNftWithCryptoModal', {
            nft: asset,
            order
          })
        )
      : dispatch(openModal('MintNftWithCryptoModal', { item: asset })),
  onBuyItemWithCard: item => dispatch(buyItemWithCardRequest(item)),
  onRedirect: path => dispatch(replace(path))
})

export default connect(mapState, mapDispatch)(BuyNFTButtons)

1	import { connect } from 'react-redux'	1✔
2	import { replace } from 'connected-react-router'	1✔
3	import { Order } from '@dcl/schemas'
4	import { openModal } from 'decentraland-dapps/dist/modules/modal/actions'	1✔
5	import { getOpenModals } from 'decentraland-dapps/dist/modules/modal/selectors'	1✔
6	import { isConnecting } from 'decentraland-dapps/dist/modules/wallet/selectors'	1✔
7	import {
8	MapDispatchProps,
9	MapDispatch,
10	MapStateProps,
11	OwnProps
12	} from './BuyNFTButtons.types'
13	import { executeOrderWithCardRequest } from '../../../../modules/order/actions'	1✔
14	import { buyItemWithCardRequest } from '../../../../modules/item/actions'	1✔
15	import { Asset, AssetType } from '../../../../modules/asset/types'	1✔
16	import { RootState } from '../../../../modules/reducer'
17	import { getWallet } from '../../../../modules/wallet/selectors'	1✔
18	import BuyNFTButtons from './BuyNFTButtons'	1✔
19
20	const mapState = (state: RootState): MapStateProps => ({	8✔
21	wallet: getWallet(state),
22	isConnecting: isConnecting(state),
23	isBuyingWithCryptoModalOpen:
24	getOpenModals(state)['BuyNftWithCryptoModal']?.open \|\|	16✔
25	getOpenModals(state)['MintNftWithCryptoModal']?.open
26	})
27
28	const mapDispatch = (	1✔
29	dispatch: MapDispatch,
30	ownProps: OwnProps
31	): MapDispatchProps => ({	4✔
UNCOV 32	onExecuteOrderWithCard: nft => dispatch(executeOrderWithCardRequest(nft)),	×
33	onBuyWithCrypto: (asset: Asset, order?: Order \| null) =>
NEW 34	ownProps.assetType === AssetType.NFT	×
35	? dispatch(
36	openModal('BuyNftWithCryptoModal', {
37	nft: asset,
38	order
39	})
40	)
41	: dispatch(openModal('MintNftWithCryptoModal', { item: asset })),
42	onBuyItemWithCard: item => dispatch(buyItemWithCardRequest(item)),	×
43	onRedirect: path => dispatch(replace(path))	×
44	})
45
46	export default connect(mapState, mapDispatch)(BuyNFTButtons)	6✔

decentraland / marketplace / 7975173206

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous