diff --git a/webapp/src/components/AssetPage/ItemDetail/ItemDetail.tsx b/webapp/src/components/AssetPage/ItemDetail/ItemDetail.tsx index e71713069..d21dfeb58 100644 --- a/webapp/src/components/AssetPage/ItemDetail/ItemDetail.tsx +++ b/webapp/src/components/AssetPage/ItemDetail/ItemDetail.tsx @@ -151,7 +151,11 @@ const ItemDetail = ({ item }: Props) => { ) : null}
-
{item.network === Network.MATIC ? : null}
+ {item.network === Network.MATIC ? ( +
+ +
+ ) : null}
diff --git a/webapp/src/components/CancelSalePage/CancelSalePage.tsx b/webapp/src/components/CancelSalePage/CancelSalePage.tsx index 3ec83c207..432171ae5 100644 --- a/webapp/src/components/CancelSalePage/CancelSalePage.tsx +++ b/webapp/src/components/CancelSalePage/CancelSalePage.tsx @@ -55,7 +55,9 @@ const CancelSalePage = (props: Props) => {
{t('cancel_sale_page.title')}
{subtitle}
- + - + + {content} { @@ -40,6 +41,7 @@ const ConfirmInputValueModal = ({ - diff --git a/webapp/src/components/Modals/SellModal/SellModal.container.ts b/webapp/src/components/Modals/SellModal/SellModal.container.ts index 10e971e76..ef5beb25a 100644 --- a/webapp/src/components/Modals/SellModal/SellModal.container.ts +++ b/webapp/src/components/Modals/SellModal/SellModal.container.ts @@ -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) } } diff --git a/webapp/src/components/Modals/SellModal/SellModal.tsx b/webapp/src/components/Modals/SellModal/SellModal.tsx index e58e64c4e..3a1d5da7f 100644 --- a/webapp/src/components/Modals/SellModal/SellModal.tsx +++ b/webapp/src/components/Modals/SellModal/SellModal.tsx @@ -322,7 +322,7 @@ const SellModal = ({ navigation: ( setStep(StepperValues.SELL_MODAL)} /> ), diff --git a/webapp/src/components/SellPage/SellModal/SellModal.tsx b/webapp/src/components/SellPage/SellModal/SellModal.tsx index ad7002f81..1bd956f78 100644 --- a/webapp/src/components/SellPage/SellModal/SellModal.tsx +++ b/webapp/src/components/SellPage/SellModal/SellModal.tsx @@ -151,7 +151,7 @@ const SellModal = (props: Props) => { {shouldRemoveListing ? (
-
@@ -189,7 +189,7 @@ const SellModal = (props: Props) => { />
- diff --git a/webapp/src/modules/modal/sagas.spec.ts b/webapp/src/modules/modal/sagas.spec.ts index 2b93b0695..f60309956 100644 --- a/webapp/src/modules/modal/sagas.spec.ts +++ b/webapp/src/modules/modal/sagas.spec.ts @@ -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, @@ -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', () => { diff --git a/webapp/src/modules/modal/sagas.ts b/webapp/src/modules/modal/sagas.ts index 9a68ea876..2086cd8d1 100644 --- a/webapp/src/modules/modal/sagas.ts +++ b/webapp/src/modules/modal/sagas.ts @@ -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, @@ -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 ) diff --git a/webapp/src/modules/vendor/decentraland/nft/authApi.ts b/webapp/src/modules/vendor/decentraland/nft/authApi.ts index 43f4662db..4321d5a8d 100644 --- a/webapp/src/modules/vendor/decentraland/nft/authApi.ts +++ b/webapp/src/modules/vendor/decentraland/nft/authApi.ts @@ -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')