Skip to content

Commit 9799b31

Browse files
feat: Add Third Party payments (#3189)
* feat: Publication fee Payment * feat: Add more changes * fix: Update test * feat: Adds hooks tests and adds loader screen for the Confirm and Pay steps * feat: Add multiple items image * feat: Add publish and push changes tests * fix: Remove unusued action reducers in the curations reducer * fix: Remove unusued action reducers in the curations reducer * fix: Types * fix: Packages problem * fix: Publishing for standard collections * fix: Add missing translations * fix: Use the weiPerEther constant
1 parent e2ccfe2 commit 9799b31

34 files changed

+1727
-533
lines changed

package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@dcl/crypto": "^3.4.5",
1212
"@dcl/hashing": "^3.0.4",
1313
"@dcl/mini-rpc": "^1.0.7",
14-
"@dcl/schemas": "^13.9.0",
14+
"@dcl/schemas": "^13.12.0",
1515
"@dcl/sdk": "7.5.5",
1616
"@dcl/single-sign-on-client": "^0.1.0",
1717
"@dcl/ui-env": "^1.5.0",

src/components/Modals/PublishWizardCollectionModal/ConfirmCollectionItemsStep/ConfirmCollectionItemsStep.css

+18
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,21 @@
107107
.ui.visible.popup.price-popup {
108108
z-index: 4000;
109109
}
110+
111+
.ConfirmCollectionItemsStep .loading-overlay {
112+
position: absolute;
113+
top: 0px;
114+
left: 0px;
115+
z-index: 1000000;
116+
background-color: rgba(var(--dark-raw), 0.78);
117+
font-weight: 500;
118+
border-radius: 8px;
119+
font-size: 20px;
120+
gap: 8px;
121+
height: 100%;
122+
width: 100%;
123+
display: flex;
124+
flex-direction: column;
125+
align-items: center;
126+
justify-content: center;
127+
}

src/components/Modals/PublishWizardCollectionModal/ConfirmCollectionItemsStep/ConfirmCollectionItemsStep.tsx

+25-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react'
22
import classNames from 'classnames'
33
import { ethers } from 'ethers'
44
import { Network } from '@dcl/schemas'
5-
import { Button, Column, Mana, Modal, Popup, Row, Table } from 'decentraland-ui'
5+
import { Button, Column, Loader, Mana, Modal, Popup, Row, Table } from 'decentraland-ui'
66
import { RarityBadge } from 'decentraland-dapps/dist/containers/RarityBadge'
77
import { t } from 'decentraland-dapps/dist/modules/translation/utils'
88
import { Item } from 'modules/item/types'
@@ -11,8 +11,14 @@ import ItemImage from 'components/ItemImage'
1111
import ItemBadge from 'components/ItemBadge'
1212
import './ConfirmCollectionItemsStep.css'
1313

14-
export const ConfirmCollectionItemsStep: React.FC<{ items: Item[]; onNextStep: () => void; onPrevStep: () => void }> = props => {
15-
const { items, onNextStep, onPrevStep } = props
14+
export const ConfirmCollectionItemsStep: React.FC<{
15+
items: Item[]
16+
onNextStep: () => void
17+
onPrevStep: () => void
18+
isSigningCheque: boolean
19+
isThirdParty: boolean
20+
}> = props => {
21+
const { items, onNextStep, onPrevStep, isSigningCheque, isThirdParty } = props
1622

1723
const renderPrice = (item: Item) => {
1824
const price = ethers.utils.formatEther(item.price!)
@@ -86,18 +92,30 @@ export const ConfirmCollectionItemsStep: React.FC<{ items: Item[]; onNextStep: (
8692
<Modal.Content className="ConfirmCollectionItemsStep">
8793
<Column>
8894
<Row className="details">
95+
{isSigningCheque && (
96+
<div className="loading-overlay">
97+
<Loader inline size="massive" />
98+
{t('publish_wizard_collection_modal.accept_in_wallet')}
99+
</div>
100+
)}
89101
<Column grow={true}>
90102
<p className="title">{t('publish_wizard_collection_modal.confirm_collection_items_step.title')}</p>
91-
<p className="subtitle">{t('publish_wizard_collection_modal.confirm_collection_items_step.subtitle', { br: <br /> })}</p>
92-
<p className="description">{t('publish_wizard_collection_modal.confirm_collection_items_step.description')}</p>
103+
<p className="subtitle">
104+
{t(`publish_wizard_collection_modal.confirm_collection_items_step.${isThirdParty ? 'third_party' : 'standard'}.subtitle`, {
105+
br: <br />
106+
})}
107+
</p>
108+
<p className="description">
109+
{t(`publish_wizard_collection_modal.confirm_collection_items_step.${isThirdParty ? 'third_party' : 'standard'}.description`)}
110+
</p>
93111
<div className="items">{renderItemsTable()}</div>
94112
</Column>
95113
</Row>
96114
<Row className="actions">
97-
<Button className="back" secondary onClick={onPrevStep}>
115+
<Button className="back" secondary disabled={isSigningCheque} onClick={onPrevStep}>
98116
{t('global.back')}
99117
</Button>
100-
<Button className="proceed" primary onClick={onNextStep}>
118+
<Button className="proceed" primary disabled={isSigningCheque} onClick={onNextStep}>
101119
{t('publish_wizard_collection_modal.confirm_collection_items_step.confirm_items')}
102120
</Button>
103121
</Row>

src/components/Modals/PublishWizardCollectionModal/PayPublicationFeeStep/PayPublicationFeeStep.css

-146
This file was deleted.

0 commit comments

Comments
 (0)