From a9647db89837860305fb2725fcfe7e8ffb934aed Mon Sep 17 00:00:00 2001
From: Melisa Anabella Rossi <melisa.rossi@decentraland.org>
Date: Tue, 7 Nov 2023 22:21:31 -0300
Subject: [PATCH 1/4] fix: add fingerprint calculation

---
 .../src/components/AssetImage/AssetImage.tsx  | 15 +++++-
 .../components/AssetImage/AssetImage.types.ts |  1 +
 .../AssetPage/EstateDetail/EstateDetail.tsx   |  1 +
 .../AssetPage/ParcelDetail/ParcelDetail.tsx   |  8 ++-
 .../src/components/Atlas/Atlas.container.ts   |  3 +-
 webapp/src/components/Atlas/Atlas.css         |  5 ++
 webapp/src/components/Atlas/Atlas.tsx         | 15 +++++-
 webapp/src/components/Atlas/Atlas.types.ts    |  4 +-
 .../components/BidPage/BidModal/BidModal.tsx  | 12 +++--
 .../BuyPage/BuyNFTModal/BuyNFTModal.tsx       | 20 ++++---
 .../ErrorBanner/ErrorBanner.module.css        | 28 ++++++++++
 .../components/ErrorBanner/ErrorBanner.tsx    | 17 ++++++
 .../ErrorBanner/ErrorBanner.types.ts          |  4 ++
 webapp/src/components/ErrorBanner/index.ts    |  2 +
 webapp/src/config/env/dev.json                | 50 ++++++++---------
 webapp/src/modules/nft/estate/utils.ts        | 53 ++++++++++++++++++-
 webapp/src/modules/nft/hooks.ts               | 47 +++++++++++++---
 webapp/src/modules/tile/actions.ts            |  4 +-
 webapp/src/modules/tile/reducer.ts            |  4 ++
 webapp/src/modules/tile/sagas.ts              | 15 +++---
 webapp/src/modules/tile/selectors.ts          |  1 +
 .../src/modules/translation/locales/en.json   |  4 ++
 .../src/modules/translation/locales/es.json   |  3 ++
 .../src/modules/translation/locales/zh.json   |  3 ++
 .../modules/vendor/decentraland/land/api.ts   | 14 +++++
 25 files changed, 277 insertions(+), 56 deletions(-)
 create mode 100644 webapp/src/components/ErrorBanner/ErrorBanner.module.css
 create mode 100644 webapp/src/components/ErrorBanner/ErrorBanner.tsx
 create mode 100644 webapp/src/components/ErrorBanner/ErrorBanner.types.ts
 create mode 100644 webapp/src/components/ErrorBanner/index.ts

diff --git a/webapp/src/components/AssetImage/AssetImage.tsx b/webapp/src/components/AssetImage/AssetImage.tsx
index 1d2c9dd148..07c5e8d949 100644
--- a/webapp/src/components/AssetImage/AssetImage.tsx
+++ b/webapp/src/components/AssetImage/AssetImage.tsx
@@ -81,6 +81,7 @@ const AssetImage = (props: Props) => {
     wearableController,
     isTryingOn,
     isPlayingEmote,
+    showUpdatedDateWarning,
     onSetIsTryingOn,
     onSetWearablePreviewController,
     onPlaySmartWearableVideoShowcase,
@@ -186,7 +187,13 @@ const AssetImage = (props: Props) => {
         setHasSound(sound)
       })
     }
-  }, [wearableController, asset.category, isDraggable, hasSound, isLoadingWearablePreview])
+  }, [
+    wearableController,
+    asset.category,
+    isDraggable,
+    hasSound,
+    isLoadingWearablePreview
+  ])
 
   const estateSelection = useMemo(() => (estate ? getSelection(estate) : []), [
     estate
@@ -257,6 +264,9 @@ const AssetImage = (props: Props) => {
           showForRent={false}
           showOnSale={false}
           showOwned={false}
+          lastUpdated={
+            showUpdatedDateWarning ? new Date(asset.updatedAt) : undefined
+          }
         >
           {hasBadges && children}
         </Atlas>
@@ -278,6 +288,9 @@ const AssetImage = (props: Props) => {
           showOnSale={false}
           showOwned={false}
           isEstate
+          lastUpdated={
+            showUpdatedDateWarning ? new Date(asset.updatedAt) : undefined
+          }
         >
           {hasBadges && children}
         </Atlas>
diff --git a/webapp/src/components/AssetImage/AssetImage.types.ts b/webapp/src/components/AssetImage/AssetImage.types.ts
index 438f6f604f..ddc18f9d22 100644
--- a/webapp/src/components/AssetImage/AssetImage.types.ts
+++ b/webapp/src/components/AssetImage/AssetImage.types.ts
@@ -25,6 +25,7 @@ export type Props = {
   className?: string
   isDraggable?: boolean
   withNavigation?: boolean
+  showUpdatedDateWarning?: boolean
   hasPopup?: boolean
   zoom?: number
   isSmall?: boolean
diff --git a/webapp/src/components/AssetPage/EstateDetail/EstateDetail.tsx b/webapp/src/components/AssetPage/EstateDetail/EstateDetail.tsx
index 8a216d170c..b86129a928 100644
--- a/webapp/src/components/AssetPage/EstateDetail/EstateDetail.tsx
+++ b/webapp/src/components/AssetPage/EstateDetail/EstateDetail.tsx
@@ -45,6 +45,7 @@ const EstateDetail = ({ nft, order, rental }: Props) => {
             isDraggable
             withNavigation
             hasPopup
+            showUpdatedDateWarning
           />
           {estate.size === 0 && (
             <div className="dissolved-wrapper">
diff --git a/webapp/src/components/AssetPage/ParcelDetail/ParcelDetail.tsx b/webapp/src/components/AssetPage/ParcelDetail/ParcelDetail.tsx
index 304d8c93aa..e4e442423c 100644
--- a/webapp/src/components/AssetPage/ParcelDetail/ParcelDetail.tsx
+++ b/webapp/src/components/AssetPage/ParcelDetail/ParcelDetail.tsx
@@ -32,7 +32,13 @@ const ParcelDetail = ({ nft, order, rental }: Props) => {
       asset={nft}
       rental={rental ?? undefined}
       assetImage={
-        <AssetImage asset={nft} isDraggable withNavigation hasPopup />
+        <AssetImage
+          asset={nft}
+          isDraggable
+          withNavigation
+          hasPopup
+          showUpdatedDateWarning
+        />
       }
       showDetails={isLand(nft)}
       isOnSale={!!nft.activeOrderId}
diff --git a/webapp/src/components/Atlas/Atlas.container.ts b/webapp/src/components/Atlas/Atlas.container.ts
index 4bc202b70f..edba68c955 100644
--- a/webapp/src/components/Atlas/Atlas.container.ts
+++ b/webapp/src/components/Atlas/Atlas.container.ts
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux'
 import { push } from 'connected-react-router'
-import { getTiles, getTilesByEstateId } from '../../modules/tile/selectors'
+import { getLastModifiedDate, getTiles, getTilesByEstateId } from '../../modules/tile/selectors'
 import { getOnRentNFTsByLessor } from '../../modules/ui/browse/selectors'
 import { RootState } from '../../modules/reducer'
 import { getWalletNFTs } from '../../modules/nft/selectors'
@@ -19,6 +19,7 @@ const mapState = (state: RootState): MapStateProps => {
     nfts: getWalletNFTs(state),
     nftsOnRent,
     tilesByEstateId: getTilesByEstateId(state),
+    lastAtlasModifiedDate: getLastModifiedDate(state),
     getContract: (query: Partial<Contract>) => getContract(state, query)
   }
 }
diff --git a/webapp/src/components/Atlas/Atlas.css b/webapp/src/components/Atlas/Atlas.css
index 878d3a3832..168747cfd9 100644
--- a/webapp/src/components/Atlas/Atlas.css
+++ b/webapp/src/components/Atlas/Atlas.css
@@ -29,6 +29,11 @@
   outline: 1px solid white;
 }
 
+.atlas-wrapper .atlas-warning-banner {
+  position: absolute;
+  bottom: 0;
+}
+
 .atlas-wrapper .atlas-info-button .info-icon {
   background-image: url('../../images/info.svg');
   width: 16px;
diff --git a/webapp/src/components/Atlas/Atlas.tsx b/webapp/src/components/Atlas/Atlas.tsx
index 7a00a1025d..da79f645f5 100644
--- a/webapp/src/components/Atlas/Atlas.tsx
+++ b/webapp/src/components/Atlas/Atlas.tsx
@@ -17,6 +17,7 @@ import { VendorName } from '../../modules/vendor'
 import { NFT } from '../../modules/nft/types'
 import Popup from './Popup'
 import './Atlas.css'
+import ErrorBanner from '../ErrorBanner'
 
 const getCoords = (x: number | string, y: number | string) => `${x},${y}`
 
@@ -35,8 +36,10 @@ const Atlas: React.FC<Props> = (props: Props) => {
     tilesByEstateId,
     withMapColorsInfo,
     withZoomControls,
+    lastAtlasModifiedDate,
     getContract,
-    children
+    children,
+    lastUpdated
   } = props
 
   const [showPopup, setShowPopup] = useState(false)
@@ -375,6 +378,16 @@ const Atlas: React.FC<Props> = (props: Props) => {
         layers={layers}
         withZoomControls={withZoomControls}
       />
+      {lastAtlasModifiedDate &&
+      lastUpdated &&
+      lastUpdated > lastAtlasModifiedDate ? (
+        <ErrorBanner
+          className="atlas-warning-banner"
+          info={t('atlas_updated_warning.info', {
+            strong: (text: string) => <strong>{text}</strong>
+          })}
+        />
+      ) : null}
       {hoveredTile ? (
         <Popup
           x={x}
diff --git a/webapp/src/components/Atlas/Atlas.types.ts b/webapp/src/components/Atlas/Atlas.types.ts
index 6183686023..f9126ccbdd 100644
--- a/webapp/src/components/Atlas/Atlas.types.ts
+++ b/webapp/src/components/Atlas/Atlas.types.ts
@@ -32,6 +32,8 @@ export type Props = Partial<AtlasProps> & {
   showOwned?: boolean
   withMapColorsInfo?: boolean
   withZoomControls?: boolean
+  lastUpdated?: Date
+  lastAtlasModifiedDate: Date | null
   getContract: (query: Partial<Contract>) => ReturnType<typeof getContract>
   onNavigate: (path: string) => void
   children?: React.ReactNode
@@ -39,7 +41,7 @@ export type Props = Partial<AtlasProps> & {
 
 export type MapStateProps = Pick<
   Props,
-  'tiles' | 'nfts' | 'nftsOnRent' | 'tilesByEstateId' | 'getContract'
+  'tiles' | 'nfts' | 'nftsOnRent' | 'tilesByEstateId' | 'getContract' | 'lastAtlasModifiedDate'
 >
 export type MapDispatchProps = Pick<Props, 'onNavigate'>
 export type MapDispatch = Dispatch<CallHistoryMethodAction>
diff --git a/webapp/src/components/BidPage/BidModal/BidModal.tsx b/webapp/src/components/BidPage/BidModal/BidModal.tsx
index 0560cdaef7..b46fd0d76e 100644
--- a/webapp/src/components/BidPage/BidModal/BidModal.tsx
+++ b/webapp/src/components/BidPage/BidModal/BidModal.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react'
 import { ethers } from 'ethers'
-import { Contract } from '@dcl/schemas'
+import { Contract, NFTCategory } from '@dcl/schemas'
 import { Header, Form, Field, Button } from 'decentraland-ui'
 import { t, T } from 'decentraland-dapps/dist/modules/translation/utils'
 import { withAuthorizedAction } from 'decentraland-dapps/dist/containers'
@@ -28,6 +28,7 @@ import { ConfirmInputValueModal } from '../../ConfirmInputValueModal'
 import { Mana } from '../../Mana'
 import { Props } from './BidModal.types'
 import './BidModal.css'
+import ErrorBanner from '../../ErrorBanner'
 
 const BidModal = (props: Props) => {
   const {
@@ -44,7 +45,7 @@ const BidModal = (props: Props) => {
   const [price, setPrice] = useState('')
   const [expiresAt, setExpiresAt] = useState(getDefaultExpirationDate())
 
-  const [fingerprint, isLoading] = useFingerprint(nft)
+  const [fingerprint, isLoading, contractFingerprint] = useFingerprint(nft)
 
   const [showConfirmationModal, setShowConfirmationModal] = useState(false)
 
@@ -106,7 +107,9 @@ const BidModal = (props: Props) => {
     isInvalidDate ||
     hasInsufficientMANA ||
     isLoading ||
-    isPlacingBid
+    isPlacingBid ||
+    (!fingerprint && nft.category === NFTCategory.ESTATE) ||
+    contractFingerprint !== fingerprint
 
   return (
     <AssetAction asset={nft}>
@@ -161,6 +164,9 @@ const BidModal = (props: Props) => {
               error={isInvalidDate}
               message={isInvalidDate ? t('bid_page.invalid_date') : undefined}
             />
+            {contractFingerprint !== fingerprint ? (
+              <ErrorBanner info={t('atlas_updated_warning.fingerprint_missmatch')} />
+            ) : null}
           </div>
           <div className="buttons">
             <Button
diff --git a/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx b/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx
index 22c70cdc79..0998f8f55b 100644
--- a/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx
+++ b/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx
@@ -33,6 +33,7 @@ import { PartiallySupportedNetworkCard } from '../PartiallySupportedNetworkCard'
 import { NotEnoughMana } from '../NotEnoughMana'
 import { PriceHasChanged } from '../PriceHasChanged'
 import { Props } from './BuyNFTModal.types'
+import ErrorBanner from '../../ErrorBanner'
 
 const BuyNFTModal = (props: Props) => {
   const {
@@ -51,7 +52,11 @@ const BuyNFTModal = (props: Props) => {
     onClearOrderErrors
   } = props
 
-  const [fingerprint, isFingerprintLoading] = useFingerprint(nft)
+  const [
+    fingerprint,
+    isFingerprintLoading,
+    contractFingerprint
+  ] = useFingerprint(nft)
   const analytics = getAnalytics()
 
   const handleExecuteOrder = useCallback(
@@ -121,7 +126,9 @@ const BuyNFTModal = (props: Props) => {
     !order ||
     isOwner ||
     (hasInsufficientMANA && !isBuyWithCardPage) ||
-    (!fingerprint && nft.category === NFTCategory.ESTATE)
+    (!fingerprint && nft.category === NFTCategory.ESTATE) ||
+    isFingerprintLoading ||
+    contractFingerprint !== fingerprint
 
   const name = <Name asset={nft} />
 
@@ -140,12 +147,6 @@ const BuyNFTModal = (props: Props) => {
     subtitle = (
       <T id={`${translationPageDescriptorId}.not_for_sale`} values={{ name }} />
     )
-  } else if (
-    !fingerprint &&
-    nft.category === NFTCategory.ESTATE &&
-    !isFingerprintLoading
-  ) {
-    subtitle = <T id={`${translationPageDescriptorId}.no_fingerprint`} />
   } else if (isOwner) {
     subtitle = (
       <T id={`${translationPageDescriptorId}.is_owner`} values={{ name }} />
@@ -202,6 +203,9 @@ const BuyNFTModal = (props: Props) => {
         <PriceTooLow chainId={nft.chainId} network={nft.network} />
       ) : null}
       <PartiallySupportedNetworkCard asset={nft} />
+      {contractFingerprint !== fingerprint ? (
+        <ErrorBanner info={t('atlas_updated_warning.fingerprint_missmatch')} />
+      ) : null}
       <div
         className={classNames('buttons', isWearableOrEmote(nft) && 'with-mana')}
       >
diff --git a/webapp/src/components/ErrorBanner/ErrorBanner.module.css b/webapp/src/components/ErrorBanner/ErrorBanner.module.css
new file mode 100644
index 0000000000..0b5787834d
--- /dev/null
+++ b/webapp/src/components/ErrorBanner/ErrorBanner.module.css
@@ -0,0 +1,28 @@
+.container {
+  background: var(--dropdown);
+  display: flex;
+  padding: 20px;
+  gap: 10px;
+}
+
+.icon {
+  background: var(--oj-not-simpson);
+  border-radius: 50%;
+  min-width: 25px;
+  height: 25px;
+  text-align: center;
+  margin: 0;
+}
+
+.icon :global(.icon) {
+  position: relative;
+  top: 2px;
+  margin: 0;
+}
+
+.info {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  text-align: left;
+}
diff --git a/webapp/src/components/ErrorBanner/ErrorBanner.tsx b/webapp/src/components/ErrorBanner/ErrorBanner.tsx
new file mode 100644
index 0000000000..bceee793eb
--- /dev/null
+++ b/webapp/src/components/ErrorBanner/ErrorBanner.tsx
@@ -0,0 +1,17 @@
+import classNames from 'classnames'
+import { Icon } from 'decentraland-ui'
+import { Props } from './ErrorBanner.types'
+import styles from './ErrorBanner.module.css'
+
+export default function ErrorBanner({ info, className }: Props) {
+  return (
+    <div className={classNames(styles.container, className)}>
+      <div className={styles.icon}>
+        <Icon name="exclamation triangle" />
+      </div>
+      <span className={styles.info}>
+        {info}
+      </span>
+    </div>
+  )
+}
diff --git a/webapp/src/components/ErrorBanner/ErrorBanner.types.ts b/webapp/src/components/ErrorBanner/ErrorBanner.types.ts
new file mode 100644
index 0000000000..5cf3a505d1
--- /dev/null
+++ b/webapp/src/components/ErrorBanner/ErrorBanner.types.ts
@@ -0,0 +1,4 @@
+export type Props = {
+  info: string;
+  className?: string;
+}
diff --git a/webapp/src/components/ErrorBanner/index.ts b/webapp/src/components/ErrorBanner/index.ts
new file mode 100644
index 0000000000..cdd8433e0e
--- /dev/null
+++ b/webapp/src/components/ErrorBanner/index.ts
@@ -0,0 +1,2 @@
+import ErrorBanner from "./ErrorBanner";
+export default ErrorBanner
diff --git a/webapp/src/config/env/dev.json b/webapp/src/config/env/dev.json
index 428d9ec103..c1f9b5f01d 100644
--- a/webapp/src/config/env/dev.json
+++ b/webapp/src/config/env/dev.json
@@ -1,43 +1,43 @@
 {
-  "NETWORK": "sepolia",
-  "CHAIN_ID": "11155111",
-  "NFT_SERVER_URL": "https://nft-api.decentraland.zone/v1",
-  "BUILDER_SERVER_URL": "https://builder-api.decentraland.zone/v1",
-  "ATLAS_SERVER_URL": "https://api.decentraland.zone",
-  "PEER_URL": "https://peer-ue-2.decentraland.zone",
-  "SIGNATURES_SERVER_URL": "https://signatures-api.decentraland.zone/v1",
-  "MARKETPLACE_FAVORITES_SERVER_URL": "https://marketplace-favorites-api.decentraland.zone/v1",
+  "NETWORK": "mainnet",
+  "CHAIN_ID": "1",
+  "NFT_SERVER_URL": "https://nft-api.decentraland.org/v1",
+  "BUILDER_SERVER_URL": "https://builder-api.decentraland.org/v1",
+  "ATLAS_SERVER_URL": "https://api.decentraland.org",
+  "PEER_URL": "https://peer.decentraland.org",
+  "SIGNATURES_SERVER_URL": "https://signatures-api.decentraland.org/v1",
+  "MARKETPLACE_FAVORITES_SERVER_URL": "https://marketplace-favorites-api.decentraland.org/v1",
   "DEFAULT_FAVORITES_LIST_ID": "70ab6873-4a03-4eb2-b331-4b8be0e0b8af",
   "DECENTRALAND_BLOG": "https://decentraland.org/blog",
   "REFRESH_SIGNATURES_DELAY": "10000",
-  "TRANSACTIONS_API_URL": "https://transactions-api.decentraland.zone/v1",
-  "TRANSAK_API_URL": "https://api-stg.transak.com/partners/api",
-  "TRANSAK_KEY": "273ac855-3472-40eb-8ee8-840e317f98e6",
-  "TRANSAK_ENV": "STAGING",
+  "TRANSACTIONS_API_URL": "https://transactions-api.decentraland.org/v1",
+  "TRANSAK_API_URL": "https://api.transak.com/partners/api",
+  "TRANSAK_KEY": "cb87de5f-add2-48a1-bab4-6a9409b811b1",
+  "TRANSAK_ENV": "PRODUCTION",
   "TRANSAK_POLLING_DELAY": "6000",
   "TRANSAK_PUSHER_APP_KEY": "1d9ffac87de599c61283",
   "TRANSAK_PUSHER_APP_CLUSTER": "ap2",
   "MOON_PAY_API_URL": "https://api.moonpay.com",
-  "MOON_PAY_API_KEY": "pk_test_WVS2xVSCnSnR7A7qIueWwCtcKnrGb55p",
+  "MOON_PAY_API_KEY": "pk_live_3PEJQj5NyvQBdit7phd48cCyzDSZFGsg",
   "MOON_PAY_POLLING_DELAY": "6000",
-  "MOON_PAY_WIDGET_URL": "https://buy-staging.moonpay.io",
-  "BUILDER_URL": "https://builder.decentraland.zone",
+  "MOON_PAY_WIDGET_URL": "https://buy.moonpay.io",
+  "BUILDER_URL": "https://builder.decentraland.org",
   "COINGECKO_API_URL": "https://api.coingecko.com/api/v3",
   "DOCS_URL": "https://docs.decentraland.org",
   "MARKETPLACE_ADAPTER_FEE_PER_MILLION": "25000",
   "MAX_PRICE_INCREASE_PERCENTAGE": "15",
-  "MANA_ADDRESS": "0x2a8fd99c19271f4f04b1b7b9c4f7cf264b626edb",
-  "CONVERTER_ADDRESS": "0x2782eb28Dcb1eF4E7632273cd4e347e130Ce4646",
+  "MANA_ADDRESS": "0x0f5d2fb29fb7d3cfee444a200298f468908cc942",
+  "CONVERTER_ADDRESS": "0x2859581da59bd4e16a866dd06b461b76d8e489a4",
   "CONVERTER_EXCHANGE": "uniswap_v2",
   "INTERCOM_APP_ID": "z0h94kay",
-  "SEGMENT_API_KEY": "gMnkewUBzA6J879kAtMvp2WhohEk36uy",
+  "SEGMENT_API_KEY": "WijgHCmOGJjV04XBGghZGEadMD4454R3",
   "DISCORD_URL": "https://dcl.gg/discord",
-  "ENVIRONMENT": "development",
+  "ENVIRONMENT": "production",
   "MIN_SALE_VALUE_IN_WEI": "1000000000000000000",
-  "EXPLORER_URL": "https://play.decentraland.zone",
-  "MARKETPLACE_URL": "https://market.decentraland.zone",
-  "PROFILE_URL": "https://profile.decentraland.zone",
-  "SSO_URL": "https://id.decentraland.zone",
-  "SUBGRAPH_WORKER": "https://subgraph.decentraland.zone",
+  "EXPLORER_URL": "https://play.decentraland.org",
+  "MARKETPLACE_URL": "https://market.decentraland.org",
+  "PROFILE_URL": "https://profile.decentraland.org",
+  "SSO_URL": "https://id.decentraland.org",
+  "SUBGRAPH_WORKER": "https://subgraph.decentraland.org",
   "SENTRY_DSN": "https://1dc401149e1c819b8477565c9cdd9b70@o4504361728212992.ingest.sentry.io/4505743351676928"
-}
\ No newline at end of file
+}
diff --git a/webapp/src/modules/nft/estate/utils.ts b/webapp/src/modules/nft/estate/utils.ts
index e139d09ad2..dcbe3bf9cc 100644
--- a/webapp/src/modules/nft/estate/utils.ts
+++ b/webapp/src/modules/nft/estate/utils.ts
@@ -1,10 +1,12 @@
 import {
   getSigner,
-  getConnectedProvider
+  getConnectedProvider,
+  getNetworkProvider
 } from 'decentraland-dapps/dist/lib/eth'
 import { EstateRegistry__factory } from '../../../contracts'
 import { Contract } from '../../vendor/services'
 import { NFT } from '../types'
+import { ethers } from 'ethers'
 
 export const getSelection = (estate: NFT['data']['estate']) => {
   return estate!.parcels.map(pair => ({
@@ -21,6 +23,55 @@ export const getCenter = (selection: { x: number; y: number }[]) => {
   return [x, y]
 }
 
+export async function generateFingerprint(
+  estateId: string,
+  parcels: { x: number; y: number }[],
+  landContract: Contract
+) {
+  const provider = await getNetworkProvider(landContract.chainId)
+  const contract = new ethers.Contract(
+    landContract.address,
+    [
+      {
+        constant: true,
+        inputs: [
+          { name: 'x', type: 'int256' },
+          { name: 'y', type: 'int256' }
+        ],
+        name: 'encodeTokenId',
+        outputs: [{ name: '', type: 'uint256' }],
+        payable: false,
+        stateMutability: 'pure',
+        type: 'function'
+      }
+    ],
+    new ethers.providers.Web3Provider(provider)
+  )
+
+  const estateTokenIds = []
+
+  for (const parcel of parcels) {
+    estateTokenIds.push(
+      (await contract.encodeTokenId(parcel.x, parcel.y)).toString()
+    )
+  }
+
+  let fingerprint = BigInt(
+    ethers.utils.solidityKeccak256(
+      ['string', 'uint256'],
+      ['estateId', estateId]
+    )
+  )
+
+  for (const tokenId of estateTokenIds) {
+    fingerprint ^= BigInt(
+      ethers.utils.solidityKeccak256(['uint256'], [tokenId])
+    )
+  }
+
+  return fingerprint.toString(16)
+}
+
 export async function getFingerprint(
   estateId: string,
   estateContract: Contract
diff --git a/webapp/src/modules/nft/hooks.ts b/webapp/src/modules/nft/hooks.ts
index a757b67f4f..603dbfb1f2 100644
--- a/webapp/src/modules/nft/hooks.ts
+++ b/webapp/src/modules/nft/hooks.ts
@@ -2,25 +2,47 @@ import { useEffect, useState } from 'react'
 import { useSelector } from 'react-redux'
 import { NFTCategory } from '@dcl/schemas'
 import { getContract } from '../contract/selectors'
+import { getTilesByEstateId } from '../tile/selectors'
 import { RootState } from '../reducer'
-import { getFingerprint } from './estate/utils'
+import { generateFingerprint, getFingerprint } from './estate/utils'
 import { NFT } from './types'
 
 export const useFingerprint = (nft: NFT | null) => {
   const [fingerprint, setFingerprint] = useState<string>()
+  const [contractFingerprint, setContractFingerprint] = useState<string>()
   const [isLoading, setIsLoading] = useState(false)
+  const [isLoadingContract, setIsLoadingContract] = useState(false)
   const estate = useSelector((state: RootState) =>
     getContract(state, { category: NFTCategory.ESTATE })
   )
+  const landContract = useSelector((state: RootState) =>
+    getContract(state, { category: NFTCategory.PARCEL })
+  )
+  const tilesByEstateId = useSelector(getTilesByEstateId)
 
   useEffect(() => {
     if (nft && estate) {
       switch (nft.category) {
         case NFTCategory.ESTATE: {
-          setIsLoading(true)
+          const parcels = (tilesByEstateId[nft.tokenId] || []).map(tile => ({
+            x: tile.x,
+            y: tile.y
+          }))
+          if (parcels.length) {
+            setIsLoading(true)
+            generateFingerprint(nft.tokenId, parcels, landContract!)
+              .finally(() => setIsLoading(false))
+              .catch(error =>
+                console.error(
+                  `Error generating fingerprint for nft ${nft.tokenId}`,
+                  error
+                )
+              )
+          }
+          setIsLoadingContract(true)
           getFingerprint(nft.tokenId, estate)
-            .then(result => setFingerprint(result))
-            .finally(() => setIsLoading(false))
+            .then(result => setContractFingerprint(result))
+            .finally(() => setIsLoadingContract(false))
             .catch(error =>
               console.error(
                 `Error getting fingerprint for nft ${nft.tokenId}`,
@@ -33,7 +55,20 @@ export const useFingerprint = (nft: NFT | null) => {
           break
       }
     }
-  }, [estate, nft, setFingerprint, setIsLoading])
+  }, [
+    estate,
+    nft,
+    landContract,
+    tilesByEstateId,
+    setFingerprint,
+    setIsLoading,
+    setIsLoadingContract,
+    setContractFingerprint
+  ])
 
-  return [fingerprint, isLoading] as const
+  return [
+    fingerprint,
+    isLoading || isLoadingContract,
+    contractFingerprint
+  ] as const
 }
diff --git a/webapp/src/modules/tile/actions.ts b/webapp/src/modules/tile/actions.ts
index da22118cf5..4000ee6121 100644
--- a/webapp/src/modules/tile/actions.ts
+++ b/webapp/src/modules/tile/actions.ts
@@ -6,8 +6,8 @@ export const FETCH_TILES_SUCCESS = '[Success] Fetch Tiles'
 export const FETCH_TILES_FAILURE = '[Failure] Fetch Tiles'
 
 export const fetchTilesRequest = () => action(FETCH_TILES_REQUEST)
-export const fetchTilesSuccess = (tiles: Record<string, AtlasTile>) =>
-  action(FETCH_TILES_SUCCESS, { tiles })
+export const fetchTilesSuccess = (tiles: Record<string, AtlasTile>, lastModified: Date) =>
+  action(FETCH_TILES_SUCCESS, { tiles, lastModified })
 export const fetchTilesFailure = (error: string) =>
   action(FETCH_TILES_FAILURE, { error })
 
diff --git a/webapp/src/modules/tile/reducer.ts b/webapp/src/modules/tile/reducer.ts
index 9c1b54fb97..ddae7f41f6 100644
--- a/webapp/src/modules/tile/reducer.ts
+++ b/webapp/src/modules/tile/reducer.ts
@@ -14,12 +14,14 @@ import {
 
 export type TileState = {
   data: Record<string, AtlasTile>
+  lastModified: Date | null
   loading: LoadingState
   error: string | null
 }
 
 const INITIAL_STATE: TileState = {
   data: {},
+  lastModified: null,
   loading: [],
   error: null
 }
@@ -34,6 +36,7 @@ export function tileReducer(state = INITIAL_STATE, action: TileReducerAction) {
     case FETCH_TILES_REQUEST: {
       return {
         ...state,
+        lastModified: null,
         loading: loadingReducer(state.loading, action)
       }
     }
@@ -41,6 +44,7 @@ export function tileReducer(state = INITIAL_STATE, action: TileReducerAction) {
       return {
         ...state,
         loading: loadingReducer(state.loading, action),
+        lastModified: action.payload.lastModified,
         error: null,
         data: action.payload.tiles
       }
diff --git a/webapp/src/modules/tile/sagas.ts b/webapp/src/modules/tile/sagas.ts
index 7a3175dc9f..9849f2916d 100644
--- a/webapp/src/modules/tile/sagas.ts
+++ b/webapp/src/modules/tile/sagas.ts
@@ -1,7 +1,7 @@
 import { takeEvery, call, put } from 'redux-saga/effects'
 import { RentalStatus } from '@dcl/schemas'
-import { Atlas, AtlasTile } from 'decentraland-ui'
-import { ATLAS_SERVER_URL } from '../../modules/vendor/decentraland'
+import { AxiosResponse } from 'axios'
+import { atlasAPI } from '../../modules/vendor/decentraland'
 import {
   FETCH_TILES_REQUEST,
   FetchTilesRequestAction,
@@ -17,6 +17,7 @@ import { isErrorWithMessage } from '../../lib/error'
 import { fetchNFTsRequest } from '../nft/actions'
 import { VendorName } from '../vendor'
 import { View } from '../ui/types'
+import { AtlasTile } from 'decentraland-ui'
 
 export function* tileSaga() {
   yield takeEvery(FETCH_TILES_REQUEST, handleFetchTilesRequest)
@@ -25,10 +26,12 @@ export function* tileSaga() {
 
 function* handleFetchTilesRequest(_action: FetchTilesRequestAction) {
   try {
-    const tiles: Record<string, AtlasTile> = yield call(() =>
-      Atlas.fetchTiles(ATLAS_SERVER_URL + '/v1/tiles')
-    )
-    yield put(fetchTilesSuccess(tiles))
+    const response: AxiosResponse<{
+      data: Record<string, AtlasTile>
+    }> = yield call(() => atlasAPI.fetchTiles())
+    const tiles = response.data.data
+    const lastModified = response.headers['last-modified']
+    yield put(fetchTilesSuccess(tiles, new Date(lastModified)))
   } catch (error) {
     yield put(
       fetchTilesFailure(
diff --git a/webapp/src/modules/tile/selectors.ts b/webapp/src/modules/tile/selectors.ts
index b5222b4687..dde0dde39b 100644
--- a/webapp/src/modules/tile/selectors.ts
+++ b/webapp/src/modules/tile/selectors.ts
@@ -7,6 +7,7 @@ export const getState = (state: RootState) => state.tile
 export const getTiles = (state: RootState) => getState(state).data
 export const getLoading = (state: RootState) => getState(state).loading
 export const getError = (state: RootState) => getState(state).error
+export const getLastModifiedDate = (state: RootState) => getState(state).lastModified
 
 export const getTilesByEstateId = createSelector<
   RootState,
diff --git a/webapp/src/modules/translation/locales/en.json b/webapp/src/modules/translation/locales/en.json
index 3525ff4db9..53e9d59174 100644
--- a/webapp/src/modules/translation/locales/en.json
+++ b/webapp/src/modules/translation/locales/en.json
@@ -1505,5 +1505,9 @@
     "title": "Smart Wearables are now live! 🟢",
     "description": "<b>Unlock the world of Portable Experiences you can own in the form of Smart Wearables.</b> Experience Decentraland like never before with Wearables that give you new abilities (like flying!) or add an extra layer of content, visible only to you, overlaid on Decentraland scenes.",
     "explore_collectibles": "Browse Smart Wearables"
+  },
+  "atlas_updated_warning": {
+    "info": "<strong>Map data may be outdated</strong>Find the most recent LAND details in the section below this map. Refreshing this page may update the information. If the problem persists, please contact our support team.",
+    "fingerprint_missmatch": "The information of this LAND may not be updated. Please refresh the page to get the latest information. If the problem persists, please contact our support team."
   }
 }
diff --git a/webapp/src/modules/translation/locales/es.json b/webapp/src/modules/translation/locales/es.json
index f40a105948..74f3b60c41 100644
--- a/webapp/src/modules/translation/locales/es.json
+++ b/webapp/src/modules/translation/locales/es.json
@@ -1496,5 +1496,8 @@
     "title": "¡Las vestimentas inteligentes ya están disponibles! 🟢",
     "description": "<b>Desbloquea el mundo de Experiencias Portátiles que puedes tener en forma de Vestimenta Interactiva.</b> Experimenta Decentraland como nunca antes con Vestimentas que te brindan nuevas habilidades (¡como volar!) o agrega una capa adicional de contenido, visible solo para usted, superpuesto en escenas de Decentraland.",
     "explore_collectibles": "Explorar vestimentas interactivas"
+  },
+  "atlas_updated_warning": {
+    "info": "<strong>Los datos del mapa pueden estar desactualizados</strong>Encuentre los detalles de la LAND más recientes en la sección debajo de este mapa. Refrescar esta página puede actualizar la información. Si el problema persiste, comuníquese con nuestro equipo de soporte."
   }
 }
diff --git a/webapp/src/modules/translation/locales/zh.json b/webapp/src/modules/translation/locales/zh.json
index fc6607a7d2..b4f1ac5778 100644
--- a/webapp/src/modules/translation/locales/zh.json
+++ b/webapp/src/modules/translation/locales/zh.json
@@ -1501,5 +1501,8 @@
     "title": "智能穿戴设备现已上线！🟢",
     "description": "<b>以智能可穿戴设备的形式解锁您可以拥有的便携式体验世界。</b> 使用可穿戴设备以前所未有的方式体验 Decentraland, 这些可穿戴设备为您提供新的能力（例如飞行！）或添加额外的层 覆盖在 Decentraland 场景上的内容, 只有您可见。",
     "explore_collectibles": "浏览智能可穿戴设备"
+  },
+  "atlas_updated_warning": {
+    "info": "<strong>地图数据可能过时</strong>Find the moST在此地图下方的部分中的最新土地详细信息。刷新此页面可能会更新信息。如果问题仍然存在，请联系我们的支持团队。"
   }
 }
diff --git a/webapp/src/modules/vendor/decentraland/land/api.ts b/webapp/src/modules/vendor/decentraland/land/api.ts
index fa41f8769d..b1bff2b1be 100644
--- a/webapp/src/modules/vendor/decentraland/land/api.ts
+++ b/webapp/src/modules/vendor/decentraland/land/api.ts
@@ -1,3 +1,17 @@
+import axios from 'axios'
+import { BaseAPI } from 'decentraland-dapps/dist/lib/api'
 import { config } from '../../../../config'
+import { retryParams } from '../utils'
 
 export const ATLAS_SERVER_URL = config.get('ATLAS_SERVER_URL')!
+const httpRequest = axios.create({ baseURL: ATLAS_SERVER_URL })
+class AtlasAPI extends BaseAPI {
+  fetchLastUpdatedDate = async (): Promise<Date> => {
+    const result: any = await this.request('get', `/v2/tiles/info`)
+    return new Date(result.lastUpdatedAt)
+  }
+
+  fetchTiles = async (): Promise<any> => httpRequest.get('/v1/tiles')
+}
+
+export const atlasAPI = new AtlasAPI(ATLAS_SERVER_URL, retryParams)

From 045299b6fd54539ded77c538b129505d7194ac66 Mon Sep 17 00:00:00 2001
From: Melisa Anabella Rossi <melisa.rossi@decentraland.org>
Date: Tue, 7 Nov 2023 22:30:27 -0300
Subject: [PATCH 2/4] remove unnecessary endpoint

---
 webapp/src/config/env/dev.json                | 50 +++++++++----------
 webapp/src/modules/tile/sagas.ts              |  2 +-
 .../src/modules/translation/locales/es.json   |  3 +-
 .../src/modules/translation/locales/zh.json   |  3 +-
 .../modules/vendor/decentraland/land/api.ts   |  5 --
 5 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/webapp/src/config/env/dev.json b/webapp/src/config/env/dev.json
index c1f9b5f01d..428d9ec103 100644
--- a/webapp/src/config/env/dev.json
+++ b/webapp/src/config/env/dev.json
@@ -1,43 +1,43 @@
 {
-  "NETWORK": "mainnet",
-  "CHAIN_ID": "1",
-  "NFT_SERVER_URL": "https://nft-api.decentraland.org/v1",
-  "BUILDER_SERVER_URL": "https://builder-api.decentraland.org/v1",
-  "ATLAS_SERVER_URL": "https://api.decentraland.org",
-  "PEER_URL": "https://peer.decentraland.org",
-  "SIGNATURES_SERVER_URL": "https://signatures-api.decentraland.org/v1",
-  "MARKETPLACE_FAVORITES_SERVER_URL": "https://marketplace-favorites-api.decentraland.org/v1",
+  "NETWORK": "sepolia",
+  "CHAIN_ID": "11155111",
+  "NFT_SERVER_URL": "https://nft-api.decentraland.zone/v1",
+  "BUILDER_SERVER_URL": "https://builder-api.decentraland.zone/v1",
+  "ATLAS_SERVER_URL": "https://api.decentraland.zone",
+  "PEER_URL": "https://peer-ue-2.decentraland.zone",
+  "SIGNATURES_SERVER_URL": "https://signatures-api.decentraland.zone/v1",
+  "MARKETPLACE_FAVORITES_SERVER_URL": "https://marketplace-favorites-api.decentraland.zone/v1",
   "DEFAULT_FAVORITES_LIST_ID": "70ab6873-4a03-4eb2-b331-4b8be0e0b8af",
   "DECENTRALAND_BLOG": "https://decentraland.org/blog",
   "REFRESH_SIGNATURES_DELAY": "10000",
-  "TRANSACTIONS_API_URL": "https://transactions-api.decentraland.org/v1",
-  "TRANSAK_API_URL": "https://api.transak.com/partners/api",
-  "TRANSAK_KEY": "cb87de5f-add2-48a1-bab4-6a9409b811b1",
-  "TRANSAK_ENV": "PRODUCTION",
+  "TRANSACTIONS_API_URL": "https://transactions-api.decentraland.zone/v1",
+  "TRANSAK_API_URL": "https://api-stg.transak.com/partners/api",
+  "TRANSAK_KEY": "273ac855-3472-40eb-8ee8-840e317f98e6",
+  "TRANSAK_ENV": "STAGING",
   "TRANSAK_POLLING_DELAY": "6000",
   "TRANSAK_PUSHER_APP_KEY": "1d9ffac87de599c61283",
   "TRANSAK_PUSHER_APP_CLUSTER": "ap2",
   "MOON_PAY_API_URL": "https://api.moonpay.com",
-  "MOON_PAY_API_KEY": "pk_live_3PEJQj5NyvQBdit7phd48cCyzDSZFGsg",
+  "MOON_PAY_API_KEY": "pk_test_WVS2xVSCnSnR7A7qIueWwCtcKnrGb55p",
   "MOON_PAY_POLLING_DELAY": "6000",
-  "MOON_PAY_WIDGET_URL": "https://buy.moonpay.io",
-  "BUILDER_URL": "https://builder.decentraland.org",
+  "MOON_PAY_WIDGET_URL": "https://buy-staging.moonpay.io",
+  "BUILDER_URL": "https://builder.decentraland.zone",
   "COINGECKO_API_URL": "https://api.coingecko.com/api/v3",
   "DOCS_URL": "https://docs.decentraland.org",
   "MARKETPLACE_ADAPTER_FEE_PER_MILLION": "25000",
   "MAX_PRICE_INCREASE_PERCENTAGE": "15",
-  "MANA_ADDRESS": "0x0f5d2fb29fb7d3cfee444a200298f468908cc942",
-  "CONVERTER_ADDRESS": "0x2859581da59bd4e16a866dd06b461b76d8e489a4",
+  "MANA_ADDRESS": "0x2a8fd99c19271f4f04b1b7b9c4f7cf264b626edb",
+  "CONVERTER_ADDRESS": "0x2782eb28Dcb1eF4E7632273cd4e347e130Ce4646",
   "CONVERTER_EXCHANGE": "uniswap_v2",
   "INTERCOM_APP_ID": "z0h94kay",
-  "SEGMENT_API_KEY": "WijgHCmOGJjV04XBGghZGEadMD4454R3",
+  "SEGMENT_API_KEY": "gMnkewUBzA6J879kAtMvp2WhohEk36uy",
   "DISCORD_URL": "https://dcl.gg/discord",
-  "ENVIRONMENT": "production",
+  "ENVIRONMENT": "development",
   "MIN_SALE_VALUE_IN_WEI": "1000000000000000000",
-  "EXPLORER_URL": "https://play.decentraland.org",
-  "MARKETPLACE_URL": "https://market.decentraland.org",
-  "PROFILE_URL": "https://profile.decentraland.org",
-  "SSO_URL": "https://id.decentraland.org",
-  "SUBGRAPH_WORKER": "https://subgraph.decentraland.org",
+  "EXPLORER_URL": "https://play.decentraland.zone",
+  "MARKETPLACE_URL": "https://market.decentraland.zone",
+  "PROFILE_URL": "https://profile.decentraland.zone",
+  "SSO_URL": "https://id.decentraland.zone",
+  "SUBGRAPH_WORKER": "https://subgraph.decentraland.zone",
   "SENTRY_DSN": "https://1dc401149e1c819b8477565c9cdd9b70@o4504361728212992.ingest.sentry.io/4505743351676928"
-}
+}
\ No newline at end of file
diff --git a/webapp/src/modules/tile/sagas.ts b/webapp/src/modules/tile/sagas.ts
index 9849f2916d..9733d73c00 100644
--- a/webapp/src/modules/tile/sagas.ts
+++ b/webapp/src/modules/tile/sagas.ts
@@ -28,7 +28,7 @@ function* handleFetchTilesRequest(_action: FetchTilesRequestAction) {
   try {
     const response: AxiosResponse<{
       data: Record<string, AtlasTile>
-    }> = yield call(() => atlasAPI.fetchTiles())
+    }> = yield call(atlasAPI.fetchTiles)
     const tiles = response.data.data
     const lastModified = response.headers['last-modified']
     yield put(fetchTilesSuccess(tiles, new Date(lastModified)))
diff --git a/webapp/src/modules/translation/locales/es.json b/webapp/src/modules/translation/locales/es.json
index 74f3b60c41..2b4dc8952c 100644
--- a/webapp/src/modules/translation/locales/es.json
+++ b/webapp/src/modules/translation/locales/es.json
@@ -1498,6 +1498,7 @@
     "explore_collectibles": "Explorar vestimentas interactivas"
   },
   "atlas_updated_warning": {
-    "info": "<strong>Los datos del mapa pueden estar desactualizados</strong>Encuentre los detalles de la LAND más recientes en la sección debajo de este mapa. Refrescar esta página puede actualizar la información. Si el problema persiste, comuníquese con nuestro equipo de soporte."
+    "info": "<strong>Los datos del mapa pueden estar desactualizados</strong>Encuentre los detalles de la LAND más recientes en la sección debajo de este mapa. Refrescar esta página puede actualizar la información. Si el problema persiste, comuníquese con nuestro equipo de soporte.",
+    "fingerprint_missmatch": "La información de esta LAND puede no estar actualizada. Actualice la página para obtener la información más reciente. Si el problema persiste, comuníquese con nuestro equipo de soporte."
   }
 }
diff --git a/webapp/src/modules/translation/locales/zh.json b/webapp/src/modules/translation/locales/zh.json
index b4f1ac5778..42ecf49137 100644
--- a/webapp/src/modules/translation/locales/zh.json
+++ b/webapp/src/modules/translation/locales/zh.json
@@ -1503,6 +1503,7 @@
     "explore_collectibles": "浏览智能可穿戴设备"
   },
   "atlas_updated_warning": {
-    "info": "<strong>地图数据可能过时</strong>Find the moST在此地图下方的部分中的最新土地详细信息。刷新此页面可能会更新信息。如果问题仍然存在，请联系我们的支持团队。"
+    "info": "<strong>地图数据可能过时</strong>Find the moST在此地图下方的部分中的最新土地详细信息。刷新此页面可能会更新信息。如果问题仍然存在，请联系我们的支持团队。",
+    "fingerprint_missmatch": "这片土地的信息可能不会更新。请刷新页面以获取最新信息。如果问题仍然存在，请联系我们的支持团队。"
   }
 }
diff --git a/webapp/src/modules/vendor/decentraland/land/api.ts b/webapp/src/modules/vendor/decentraland/land/api.ts
index b1bff2b1be..c8986480c6 100644
--- a/webapp/src/modules/vendor/decentraland/land/api.ts
+++ b/webapp/src/modules/vendor/decentraland/land/api.ts
@@ -6,11 +6,6 @@ import { retryParams } from '../utils'
 export const ATLAS_SERVER_URL = config.get('ATLAS_SERVER_URL')!
 const httpRequest = axios.create({ baseURL: ATLAS_SERVER_URL })
 class AtlasAPI extends BaseAPI {
-  fetchLastUpdatedDate = async (): Promise<Date> => {
-    const result: any = await this.request('get', `/v2/tiles/info`)
-    return new Date(result.lastUpdatedAt)
-  }
-
   fetchTiles = async (): Promise<any> => httpRequest.get('/v1/tiles')
 }
 

From 7ee4117d4f89003f6deec86f8f9de5453837425c Mon Sep 17 00:00:00 2001
From: Melisa Anabella Rossi <melisa.rossi@decentraland.org>
Date: Mon, 13 Nov 2023 03:30:20 -0300
Subject: [PATCH 3/4] fix add tests

---
 webapp/src/components/Atlas/Atlas.css         |   1 +
 webapp/src/components/Atlas/Atlas.tsx         |   2 +-
 .../components/BidPage/BidModal/BidModal.tsx  |   2 +-
 .../BuyPage/BuyNFTModal/BuyNFTModal.tsx       |   4 +-
 webapp/src/modules/nft/estate/utils.ts        |   4 +-
 webapp/src/modules/nft/hooks.spec.tsx         | 121 ++++++++++++++++++
 webapp/src/modules/nft/hooks.ts               |   3 +-
 7 files changed, 129 insertions(+), 8 deletions(-)
 create mode 100644 webapp/src/modules/nft/hooks.spec.tsx

diff --git a/webapp/src/components/Atlas/Atlas.css b/webapp/src/components/Atlas/Atlas.css
index 168747cfd9..20db86d2da 100644
--- a/webapp/src/components/Atlas/Atlas.css
+++ b/webapp/src/components/Atlas/Atlas.css
@@ -32,6 +32,7 @@
 .atlas-wrapper .atlas-warning-banner {
   position: absolute;
   bottom: 0;
+  width: 100%;
 }
 
 .atlas-wrapper .atlas-info-button .info-icon {
diff --git a/webapp/src/components/Atlas/Atlas.tsx b/webapp/src/components/Atlas/Atlas.tsx
index da79f645f5..65fdf8e0c9 100644
--- a/webapp/src/components/Atlas/Atlas.tsx
+++ b/webapp/src/components/Atlas/Atlas.tsx
@@ -15,9 +15,9 @@ import { nftAPI } from '../../modules/vendor/decentraland/nft/api'
 import { Props, Tile } from './Atlas.types'
 import { VendorName } from '../../modules/vendor'
 import { NFT } from '../../modules/nft/types'
+import ErrorBanner from '../ErrorBanner'
 import Popup from './Popup'
 import './Atlas.css'
-import ErrorBanner from '../ErrorBanner'
 
 const getCoords = (x: number | string, y: number | string) => `${x},${y}`
 
diff --git a/webapp/src/components/BidPage/BidModal/BidModal.tsx b/webapp/src/components/BidPage/BidModal/BidModal.tsx
index b46fd0d76e..9ec424c968 100644
--- a/webapp/src/components/BidPage/BidModal/BidModal.tsx
+++ b/webapp/src/components/BidPage/BidModal/BidModal.tsx
@@ -26,9 +26,9 @@ import { getBidStatus, getError } from '../../../modules/bid/selectors'
 import { ManaField } from '../../ManaField'
 import { ConfirmInputValueModal } from '../../ConfirmInputValueModal'
 import { Mana } from '../../Mana'
+import ErrorBanner from '../../ErrorBanner'
 import { Props } from './BidModal.types'
 import './BidModal.css'
-import ErrorBanner from '../../ErrorBanner'
 
 const BidModal = (props: Props) => {
   const {
diff --git a/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx b/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx
index 0998f8f55b..12b34ecb48 100644
--- a/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx
+++ b/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx
@@ -20,11 +20,12 @@ import { getContractNames } from '../../../modules/vendor'
 import * as events from '../../../utils/events'
 import { AssetType } from '../../../modules/asset/types'
 import { Contract as DCLContract } from '../../../modules/vendor/services'
+import { getBuyItemStatus, getError } from '../../../modules/order/selectors'
 import { AssetAction } from '../../AssetAction'
 import { Network as NetworkSubtitle } from '../../Network'
 import PriceSubtitle from '../../Price'
 import { AssetProviderPage } from '../../AssetProviderPage'
-import { getBuyItemStatus, getError } from '../../../modules/order/selectors'
+import ErrorBanner from '../../ErrorBanner'
 import { PriceTooLow } from '../PriceTooLow'
 import { Name } from '../Name'
 import { Price } from '../Price'
@@ -33,7 +34,6 @@ import { PartiallySupportedNetworkCard } from '../PartiallySupportedNetworkCard'
 import { NotEnoughMana } from '../NotEnoughMana'
 import { PriceHasChanged } from '../PriceHasChanged'
 import { Props } from './BuyNFTModal.types'
-import ErrorBanner from '../../ErrorBanner'
 
 const BuyNFTModal = (props: Props) => {
   const {
diff --git a/webapp/src/modules/nft/estate/utils.ts b/webapp/src/modules/nft/estate/utils.ts
index dcbe3bf9cc..b452fe20e1 100644
--- a/webapp/src/modules/nft/estate/utils.ts
+++ b/webapp/src/modules/nft/estate/utils.ts
@@ -51,9 +51,7 @@ export async function generateFingerprint(
   const estateTokenIds = []
 
   for (const parcel of parcels) {
-    estateTokenIds.push(
-      (await contract.encodeTokenId(parcel.x, parcel.y)).toString()
-    )
+    estateTokenIds.push(await contract.encodeTokenId(parcel.x, parcel.y))
   }
 
   let fingerprint = BigInt(
diff --git a/webapp/src/modules/nft/hooks.spec.tsx b/webapp/src/modules/nft/hooks.spec.tsx
new file mode 100644
index 0000000000..437b9b0f0f
--- /dev/null
+++ b/webapp/src/modules/nft/hooks.spec.tsx
@@ -0,0 +1,121 @@
+import { renderHook } from '@testing-library/react-hooks'
+import { ChainId, NFTCategory, Network } from '@dcl/schemas'
+import { useSelector } from 'react-redux'
+import { RootState } from '../reducer'
+import { VendorName } from '../vendor'
+import { generateFingerprint, getFingerprint } from './estate/utils'
+import { useFingerprint } from './hooks'
+import { NFT } from './types'
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn()
+}))
+
+jest.mock('./estate/utils', () => ({
+  generateFingerprint: jest.fn(),
+  getFingerprint: jest.fn()
+}))
+
+let nft: NFT
+
+describe('when the nft is not an estate', () => {
+  beforeEach(() => {
+    nft = {
+      id: 'test-id',
+      category: NFTCategory.PARCEL
+    } as NFT
+  })
+
+  it('should return fingerprint as undefiend', () => {
+    const { result } = renderHook(() => useFingerprint(nft))
+    const [fingerprint] = result.current
+    expect(fingerprint).toBe(undefined)
+  })
+
+  it('should return contractFingerprint as undefined', () => {
+    const { result } = renderHook(() => useFingerprint(nft))
+    const [_contract, _isLoading, contractFingerprint] = result.current
+    expect(contractFingerprint).toBe(undefined)
+  })
+
+  it('should return loading as false', () => {
+    const { result } = renderHook(() => useFingerprint(nft))
+    const [_contract, isLoading] = result.current
+    expect(isLoading).toBe(false)
+  })
+})
+
+describe('when the nft is an estate', () => {
+  let fingerprint: string
+  let contractFingerprint: string
+
+  beforeEach(() => {
+    nft = {
+      id: 'estate-id',
+      tokenId: 'estate-id',
+      category: NFTCategory.ESTATE,
+      data: {
+        estate: {
+          size: 2,
+          description: 'estate desc',
+          parcels: [
+            { x: 1, y: 1 },
+            { x: 1, y: 2 }
+          ]
+        }
+      }
+    } as NFT
+
+    const appData: Partial<RootState> = {
+      tile: {
+        data: {
+          '1,1': {
+            x: 1,
+            y: 1,
+            type: 1,
+            owner: 'test',
+            estate_id: 'estate-id'
+          }
+        },
+        lastModified: null,
+        loading: [],
+        error: null
+      },
+      contract: {
+        loading: [],
+        error: null,
+        hasFetched: false,
+        data: [
+          {
+            name: 'estate',
+            chainId: ChainId.ETHEREUM_SEPOLIA,
+            address: 'add',
+            network: Network.ETHEREUM,
+            vendor: VendorName.DECENTRALAND,
+            category: NFTCategory.ESTATE
+          }
+        ]
+      }
+    }
+    ;(useSelector as jest.Mock).mockImplementation((callback: Function) =>
+      callback(appData)
+    )
+
+    fingerprint = '0x123123'
+    contractFingerprint = '0x456456'
+    ;(generateFingerprint as jest.Mock).mockResolvedValue(fingerprint)
+    ;(getFingerprint as jest.Mock).mockResolvedValue(contractFingerprint)
+  })
+  it('should return calculated fingerprint of parcels', async () => {
+    const { result, waitFor } = renderHook(() => useFingerprint(nft))
+    await waitFor(() => expect(result.current[1]).toBe(false))
+    expect(result.current[0]).toEqual(fingerprint)
+  })
+
+  it('should return contract fingerprint', async () => {
+    const { result, waitFor } = renderHook(() => useFingerprint(nft))
+    await waitFor(() => expect(result.current[1]).toBe(false))
+    expect(result.current[2]).toEqual(contractFingerprint)
+  })
+})
diff --git a/webapp/src/modules/nft/hooks.ts b/webapp/src/modules/nft/hooks.ts
index 603dbfb1f2..a9e6fbbdc5 100644
--- a/webapp/src/modules/nft/hooks.ts
+++ b/webapp/src/modules/nft/hooks.ts
@@ -31,6 +31,7 @@ export const useFingerprint = (nft: NFT | null) => {
           if (parcels.length) {
             setIsLoading(true)
             generateFingerprint(nft.tokenId, parcels, landContract!)
+              .then((result) => setFingerprint(result))
               .finally(() => setIsLoading(false))
               .catch(error =>
                 console.error(
@@ -38,7 +39,7 @@ export const useFingerprint = (nft: NFT | null) => {
                   error
                 )
               )
-          }
+          }                                                                                                                 
           setIsLoadingContract(true)
           getFingerprint(nft.tokenId, estate)
             .then(result => setContractFingerprint(result))

From e608708d5f77b964c8891f3b35914f66f7bcc257 Mon Sep 17 00:00:00 2001
From: Melisa Anabella Rossi <melisa.rossi@decentraland.org>
Date: Mon, 13 Nov 2023 10:14:29 -0300
Subject: [PATCH 4/4] fix fingerprint abnner

---
 webapp/src/components/BidPage/BidModal/BidModal.tsx       | 8 ++++----
 webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx | 2 +-
 webapp/src/modules/nft/estate/utils.ts                    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/src/components/BidPage/BidModal/BidModal.tsx b/webapp/src/components/BidPage/BidModal/BidModal.tsx
index 9ec424c968..66fc8b0030 100644
--- a/webapp/src/components/BidPage/BidModal/BidModal.tsx
+++ b/webapp/src/components/BidPage/BidModal/BidModal.tsx
@@ -45,7 +45,7 @@ const BidModal = (props: Props) => {
   const [price, setPrice] = useState('')
   const [expiresAt, setExpiresAt] = useState(getDefaultExpirationDate())
 
-  const [fingerprint, isLoading, contractFingerprint] = useFingerprint(nft)
+  const [fingerprint, isLoadingFingerprint, contractFingerprint] = useFingerprint(nft)
 
   const [showConfirmationModal, setShowConfirmationModal] = useState(false)
 
@@ -106,7 +106,7 @@ const BidModal = (props: Props) => {
     isInvalidPrice ||
     isInvalidDate ||
     hasInsufficientMANA ||
-    isLoading ||
+    isLoadingFingerprint ||
     isPlacingBid ||
     (!fingerprint && nft.category === NFTCategory.ESTATE) ||
     contractFingerprint !== fingerprint
@@ -164,14 +164,14 @@ const BidModal = (props: Props) => {
               error={isInvalidDate}
               message={isInvalidDate ? t('bid_page.invalid_date') : undefined}
             />
-            {contractFingerprint !== fingerprint ? (
+            {!isLoadingFingerprint && contractFingerprint !== fingerprint ? (
               <ErrorBanner info={t('atlas_updated_warning.fingerprint_missmatch')} />
             ) : null}
           </div>
           <div className="buttons">
             <Button
               as="div"
-              disabled={isLoading || isPlacingBid}
+              disabled={isLoadingFingerprint || isPlacingBid}
               onClick={() =>
                 onNavigate(locations.nft(nft.contractAddress, nft.tokenId))
               }
diff --git a/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx b/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx
index 12b34ecb48..68a020e2a6 100644
--- a/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx
+++ b/webapp/src/components/BuyPage/BuyNFTModal/BuyNFTModal.tsx
@@ -203,7 +203,7 @@ const BuyNFTModal = (props: Props) => {
         <PriceTooLow chainId={nft.chainId} network={nft.network} />
       ) : null}
       <PartiallySupportedNetworkCard asset={nft} />
-      {contractFingerprint !== fingerprint ? (
+      {!isFingerprintLoading && contractFingerprint !== fingerprint ? (
         <ErrorBanner info={t('atlas_updated_warning.fingerprint_missmatch')} />
       ) : null}
       <div
diff --git a/webapp/src/modules/nft/estate/utils.ts b/webapp/src/modules/nft/estate/utils.ts
index b452fe20e1..dc61945315 100644
--- a/webapp/src/modules/nft/estate/utils.ts
+++ b/webapp/src/modules/nft/estate/utils.ts
@@ -67,7 +67,7 @@ export async function generateFingerprint(
     )
   }
 
-  return fingerprint.toString(16)
+  return ethers.utils.hexlify(fingerprint)
 }
 
 export async function getFingerprint(