Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Multiple off chain issues #2344

Merged
merged 7 commits into from
Jan 2, 2025
6 changes: 5 additions & 1 deletion webapp/src/components/AssetPage/ItemDetail/ItemDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,11 @@ const ItemDetail = ({ item }: Props) => {
) : null}
</div>
<div className={styles.attributesRow}>
<div className={styles.attributesColumn}>{item.network === Network.MATIC ? <Owner asset={item} /> : null}</div>
{item.network === Network.MATIC ? (
<div className={styles.attributesColumn}>
<Owner asset={item} />
</div>
) : null}
<div className={styles.attributesColumn}>
<Collection asset={item} />
</div>
Expand Down
4 changes: 3 additions & 1 deletion webapp/src/components/CancelSalePage/CancelSalePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ const CancelSalePage = (props: Props) => {
<Header size="large">{t('cancel_sale_page.title')}</Header>
<div className="subtitle">{subtitle}</div>
<div className="buttons">
<Button onClick={() => history.push(locations.nft(nft.contractAddress, nft.tokenId))}>{t('global.cancel')}</Button>
<Button disabled={isLoading} onClick={() => history.push(locations.nft(nft.contractAddress, nft.tokenId))}>
{t('global.cancel')}
</Button>
<ChainButton
primary
loading={isLoading}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ const ConfirmInputValueModal = ({
const isDisabled = disabled || parsedValueToConfirm !== confirmedInput

return (
<Modal size="small" open={open} className="ConfirmInputValueModal">
<ModalNavigation title={headerTitle} onClose={onCancel}></ModalNavigation>
<Modal size="small" open={open} onClose={!loading ? onCancel : undefined} className="ConfirmInputValueModal">
<ModalNavigation title={headerTitle} onClose={!loading ? onCancel : undefined}></ModalNavigation>
<Modal.Content>
{content}
<ManaField
label={t('global.price')}
network={network}
disabled={loading}
placeholder={parsedValueToConfirm}
value={confirmedInput}
onChange={(_event, props) => {
Expand All @@ -40,14 +41,15 @@ const ConfirmInputValueModal = ({
<Modal.Actions>
<Button
type="button"
disabled={loading}
onClick={() => {
setConfirmedInput('')
onCancel()
}}
>
{t('global.cancel')}
</Button>
<Button type="submit" primary disabled={isDisabled} loading={loading} onClick={onConfirm}>
<Button type="submit" primary disabled={isDisabled || loading} loading={loading} onClick={onConfirm}>
{t('global.proceed')}
</Button>
</Modal.Actions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const mapState = (state: RootState): MapStateProps => {
authorizations: getAuthorizations(state),
isCreatingOrder: isLoadingType(getLoadingOrders(state), CREATE_ORDER_REQUEST),
isAuthorizing: isLoadingType(getLoading(state), GRANT_TOKEN_REQUEST) || isLoadingType(getLoading(state), REVOKE_TOKEN_REQUEST),
isCancelling: isLoadingType(getLoading(state), CANCEL_ORDER_REQUEST),
isCancelling: isLoadingType(getLoadingOrders(state), CANCEL_ORDER_REQUEST),
isOffchainPublicNFTOrdersEnabled: getIsOffchainPublicNFTOrdersEnabled(state)
}
}
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/components/Modals/SellModal/SellModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ const SellModal = ({
navigation: (
<ModalNavigation
title={t('sell_page.confirm.title')}
onClose={onClose}
onClose={isCancelling ? undefined : onClose}
onBack={isCancelling || shouldRemoveOffchainListing ? undefined : () => setStep(StepperValues.SELL_MODAL)}
/>
),
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/components/SellPage/SellModal/SellModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ const SellModal = (props: Props) => {
{shouldRemoveListing ? (
<div className="cancel-order">
<ErrorBanner info={t('sell_page.cancel_order_warning')} />
<Button primary onClick={handleCancelTrade} loading={isLoadingCancelOrder}>
<Button primary onClick={handleCancelTrade} disabled={isLoadingCancelOrder} loading={isLoadingCancelOrder}>
{t('sell_page.cancel_order')}
</Button>
</div>
Expand Down Expand Up @@ -189,7 +189,7 @@ const SellModal = (props: Props) => {
/>
</div>
<div className="buttons">
<Button as="div" onClick={onGoBack}>
<Button as="div" disabled={isLoading} onClick={onGoBack}>
{t('global.cancel')}
</Button>
<ChainButton type="submit" primary disabled={isDisabled || isLoading} loading={isLoading} chainId={nft.chainId}>
Expand Down
2 changes: 2 additions & 0 deletions webapp/src/modules/modal/sagas.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
UPDATE_LIST_SUCCESS
} from '../favorites/actions'
import { NFT } from '../nft/types'
import { CANCEL_ORDER_SUCCESS } from '../order/actions'
import {
claimAssetSuccess,
upsertRentalSuccess,
Expand All @@ -31,6 +32,7 @@ describe.each([
DELETE_LIST_FAILURE,
BULK_PICK_SUCCESS,
BULK_PICK_FAILURE,
CANCEL_ORDER_SUCCESS,
UPDATE_LIST_SUCCESS
])('when handling the success action of the %s action', actionType => {
it('should put the action to close all modals', () => {
Expand Down
4 changes: 3 additions & 1 deletion webapp/src/modules/modal/sagas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
DELETE_LIST_SUCCESS,
UPDATE_LIST_SUCCESS
} from '../favorites/actions'
import { CANCEL_ORDER_SUCCESS } from '../order/actions'
import {
CLAIM_ASSET_SUCCESS,
UPSERT_RENTAL_SUCCESS,
Expand All @@ -27,7 +28,8 @@ export function* modalSaga() {
DELETE_LIST_FAILURE,
BULK_PICK_SUCCESS,
BULK_PICK_FAILURE,
UPDATE_LIST_SUCCESS
UPDATE_LIST_SUCCESS,
CANCEL_ORDER_SUCCESS
],
handleCloseAllModals
)
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/modules/vendor/decentraland/nft/authApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export class NFTAuthAPI extends BaseClient {
: null
)
}
const response: NFTResponse = await this.fetch(`/v1/nfts?${queryParams.toString()}`)
const response: NFTResponse = await this.fetch(`/v1/nfts?${queryParams.toString()}`, { cache: 'reload' })

if (response.data.length === 0) {
throw new Error('Not found')
Expand Down
Loading