From a71288c0001f41491f4d6c22f5d5ee0ac851dec3 Mon Sep 17 00:00:00 2001
From: Ignacio Mazzara <nacho@decentraland.org>
Date: Mon, 25 Feb 2019 14:31:22 -0300
Subject: [PATCH] feat: fingerprint changed

---
 shared/bid.js                                        |  2 +-
 src/Translation/locales/en.json                      |  2 +-
 src/Translation/locales/es.json                      |  5 +++--
 src/Translation/locales/fr.json                      |  3 ++-
 src/Translation/locales/ja.json                      |  3 ++-
 src/Translation/locales/ko.json                      |  3 ++-
 src/Translation/locales/zh.json                      |  2 +-
 webapp/src/components/Bid/Bid.js                     |  3 +--
 .../BidAssetPage/BidEstatePage/BidEstatePage.js      | 10 +++++-----
 .../BidAssetPage/BidParcelPage/BidParcelPage.js      | 10 +++++-----
 .../components/ParcelDetailPage/ParcelDetailPage.js  | 12 +++++++++---
 webapp/src/modules/bid/selectors.js                  |  2 +-
 12 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/shared/bid.js b/shared/bid.js
index 3b1c62dd4..8b91fa2c3 100644
--- a/shared/bid.js
+++ b/shared/bid.js
@@ -5,7 +5,7 @@ export function isAssetBid(bid, assetId, assetType) {
 }
 
 export function fingerprintHasChanged(bid) {
-  return bid.status === LISTING_STATUS.fingerprintChanged
+  return bid && bid.status === LISTING_STATUS.fingerprintChanged
 }
 
 export function isActive(bid) {
diff --git a/src/Translation/locales/en.json b/src/Translation/locales/en.json
index 32720a0c5..210938e78 100644
--- a/src/Translation/locales/en.json
+++ b/src/Translation/locales/en.json
@@ -30,7 +30,7 @@
     "expiration": "Expiration",
     "expiration_placeholder": "Expiration date for this publication",
     "fingerprint_changed":
-      "This {asset_name} has been modified. You can only cancel the bid.",
+      "This {asset_name} has been modified. Plase update or cancel the bid.",
     "insufficient_funds":
       "The bidder has insufficient funds to pay for the bid",
     "list_asset": "Place a bid for the {asset_name}",
diff --git a/src/Translation/locales/es.json b/src/Translation/locales/es.json
index fb09ce85d..53bddb74e 100644
--- a/src/Translation/locales/es.json
+++ b/src/Translation/locales/es.json
@@ -30,13 +30,14 @@
     },
     "expiration": "Vencimiento",
     "expiration_placeholder": "Fecha de expiración de esta publicación.",
-    "fingerprint_changed": "Este {asset_name} ha sido modificado. ",
+    "fingerprint_changed":
+      "Este {asset_name} ha sido modificado. Por favor modifica o cancela la oferta.",
     "insufficient_funds":
       "El ofertante no tiene fondos suficientes para pagar la oferta.",
     "list_asset": "Haz una oferta por el {asset_name}",
     "not_enough": "No tienes suficiente MANA en tu cuenta",
     "please_authorize":
-      "Debe ir a {settings_link} y autorizar el contrato de la Oferta para utilizar MANA en su nombre antes de poder realizar una oferta.",
+      "Debe ir a {settings_link} y autorizar el contrato de la oferta para utilizar MANA en su nombre antes de poder realizar una oferta.",
     "price_placeholder": "Precio en MANA para este {asset_name}.",
     "set_asset_price":
       "Establecer un precio y una fecha de vencimiento para {asset_name}.",
diff --git a/src/Translation/locales/fr.json b/src/Translation/locales/fr.json
index 36bbf831d..2261d56b7 100644
--- a/src/Translation/locales/fr.json
+++ b/src/Translation/locales/fr.json
@@ -32,7 +32,8 @@
     },
     "expiration": "Expiration",
     "expiration_placeholder": "Date d'expiration pour cette publication",
-    "fingerprint_changed": "Ce {asset_name} a été modifié. ",
+    "fingerprint_changed":
+      "Ce {asset_name} a été modifié. Veuillez mettre à jour ou annuler l'offre.",
     "insufficient_funds":
       "Le soumissionnaire n'a pas suffisamment de fonds pour payer pour la soumission",
     "list_asset": "Placer une offre pour le {asset_name}",
diff --git a/src/Translation/locales/ja.json b/src/Translation/locales/ja.json
index 1bb0a7fa2..a198006d0 100644
--- a/src/Translation/locales/ja.json
+++ b/src/Translation/locales/ja.json
@@ -29,7 +29,8 @@
     },
     "expiration": "有効期限",
     "expiration_placeholder": "この出版物の有効期限",
-    "fingerprint_changed": "この{asset_name}は修正されました。",
+    "fingerprint_changed":
+      "この{asset_name}は修正されました。入札を更新またはキャンセルしてください。",
     "insufficient_funds": "入札者が入札のために支払うには資金が足りない",
     "list_asset": "{asset_name}に入札する",
     "not_enough": "あなたのアカウントに十分なMANAがありません",
diff --git a/src/Translation/locales/ko.json b/src/Translation/locales/ko.json
index a30146b74..930f302c4 100644
--- a/src/Translation/locales/ko.json
+++ b/src/Translation/locales/ko.json
@@ -29,7 +29,8 @@
     },
     "expiration": "만료",
     "expiration_placeholder": "이 발행물의 만료일",
-    "fingerprint_changed": "이 {asset_name}가 수정되었습니다. ",
+    "fingerprint_changed":
+      "이 {asset_name}가 수정되었습니다. 입찰가를 업데이트하거나 취소하십시오.",
     "insufficient_funds": "입찰자가 입찰 비용을 지불하기에 부족합니다.",
     "list_asset": "{asset_name}에 입찰하기",
     "not_enough": "계정에 MANA가 충분하지 않습니다.",
diff --git a/src/Translation/locales/zh.json b/src/Translation/locales/zh.json
index 01ac08fa6..bcb24ddff 100644
--- a/src/Translation/locales/zh.json
+++ b/src/Translation/locales/zh.json
@@ -27,7 +27,7 @@
     },
     "expiration": "呼气",
     "expiration_placeholder": "本出版物的截止日期",
-    "fingerprint_changed": "此{asset_name}已被修改。",
+    "fingerprint_changed": "此{asset_name}已被修改。 请更新或取消出价。",
     "insufficient_funds": "投标人没有足够的资金来支付投标费用",
     "list_asset": "对{asset_name}进行出价",
     "not_enough": "您的帐户中没有足够的MANA",
diff --git a/webapp/src/components/Bid/Bid.js b/webapp/src/components/Bid/Bid.js
index 684b3af83..bbd6cc0e0 100644
--- a/webapp/src/components/Bid/Bid.js
+++ b/webapp/src/components/Bid/Bid.js
@@ -203,8 +203,7 @@ export default class Bid extends React.PureComponent {
                     : t('global.accept')}
                 </Button>
                 {!isOwner &&
-                  !hasSameSellerAndBidder &&
-                  !fingerprintChanged && (
+                  !hasSameSellerAndBidder && (
                     <Button
                       className="primary"
                       onClick={preventDefault(onUpdate)}
diff --git a/webapp/src/components/BidAssetPage/BidEstatePage/BidEstatePage.js b/webapp/src/components/BidAssetPage/BidEstatePage/BidEstatePage.js
index fda93db2d..2c52a85bb 100644
--- a/webapp/src/components/BidAssetPage/BidEstatePage/BidEstatePage.js
+++ b/webapp/src/components/BidAssetPage/BidEstatePage/BidEstatePage.js
@@ -5,7 +5,7 @@ import { Container, Message } from 'semantic-ui-react'
 import { t, T } from '@dapps/modules/translation/utils'
 
 import { locations } from 'locations'
-import { isOpen } from 'shared/listing'
+import { isActive } from 'shared/bid'
 import BidAssetForm from '../BidAssetForm'
 import { authorizationType, bidType, walletType } from 'components/types'
 import Estate from 'components/Estate'
@@ -29,7 +29,7 @@ export default class BidEstatePage extends React.PureComponent {
   render() {
     const { id, bid, isTxIdle, onBid, onCancel, isAllowed, wallet } = this.props
 
-    const isBidOpen = isOpen(bid)
+    const isBidActive = isActive(bid)
 
     return (
       <Estate id={id} ownerNotAllowed>
@@ -60,7 +60,7 @@ export default class BidEstatePage extends React.PureComponent {
               title={
                 <T
                   id={
-                    isBidOpen
+                    isBidActive
                       ? 'asset_bid.update_asset'
                       : 'asset_bid.list_asset'
                   }
@@ -70,7 +70,7 @@ export default class BidEstatePage extends React.PureComponent {
               subtitle={
                 <T
                   id={
-                    isBidOpen
+                    isBidActive
                       ? 'asset_bid.set_new_asset_price'
                       : 'asset_bid.set_asset_price'
                   }
@@ -82,7 +82,7 @@ export default class BidEstatePage extends React.PureComponent {
               <BidAssetForm
                 asset={estate}
                 assetName={t('name.estate')}
-                bid={isBidOpen ? bid : null}
+                bid={isBidActive ? bid : null}
                 isTxIdle={isTxIdle}
                 onBid={onBid}
                 onCancel={onCancel}
diff --git a/webapp/src/components/BidAssetPage/BidParcelPage/BidParcelPage.js b/webapp/src/components/BidAssetPage/BidParcelPage/BidParcelPage.js
index ec2390437..841b7b6cd 100644
--- a/webapp/src/components/BidAssetPage/BidParcelPage/BidParcelPage.js
+++ b/webapp/src/components/BidAssetPage/BidParcelPage/BidParcelPage.js
@@ -5,7 +5,7 @@ import { Container, Message } from 'semantic-ui-react'
 import { t, T } from '@dapps/modules/translation/utils'
 
 import { locations } from 'locations'
-import { isOpen } from 'shared/listing'
+import { isActive } from 'shared/bid'
 import { splitCoordinate } from 'shared/coordinates'
 import BidAssetForm from '../BidAssetForm'
 import { authorizationType, bidType, walletType } from 'components/types'
@@ -32,7 +32,7 @@ export default class BidParcelPage extends React.PureComponent {
     const { id, bid, isTxIdle, onBid, onCancel, isAllowed, wallet } = this.props
 
     const [x, y] = splitCoordinate(id)
-    const isBidOpen = isOpen(bid)
+    const isBidActive = isActive(bid)
 
     return (
       <Parcel x={x} y={y} ownerNotAllowed>
@@ -64,7 +64,7 @@ export default class BidParcelPage extends React.PureComponent {
               title={
                 <T
                   id={
-                    isBidOpen
+                    isBidActive
                       ? 'asset_bid.update_asset'
                       : 'asset_bid.list_asset'
                   }
@@ -74,7 +74,7 @@ export default class BidParcelPage extends React.PureComponent {
               subtitle={
                 <T
                   id={
-                    isBidOpen
+                    isBidActive
                       ? 'asset_bid.set_new_asset_price'
                       : 'asset_bid.set_asset_price'
                   }
@@ -88,7 +88,7 @@ export default class BidParcelPage extends React.PureComponent {
               <BidAssetForm
                 asset={parcel}
                 assetName={t('name.parcel')}
-                bid={isBidOpen ? bid : null}
+                bid={isBidActive ? bid : null}
                 isTxIdle={isTxIdle}
                 onBid={onBid}
                 onCancel={onCancel}
diff --git a/webapp/src/components/ParcelDetailPage/ParcelDetailPage.js b/webapp/src/components/ParcelDetailPage/ParcelDetailPage.js
index 3987eebff..7547ec6e4 100644
--- a/webapp/src/components/ParcelDetailPage/ParcelDetailPage.js
+++ b/webapp/src/components/ParcelDetailPage/ParcelDetailPage.js
@@ -19,6 +19,7 @@ import {
 import { getOpenPublication, ASSET_TYPES } from 'shared/asset'
 import { getDistrict } from 'shared/district'
 import { hasTags } from 'shared/parcel'
+import { isOpen, isActive } from 'shared/listing'
 import ParcelOwner from './ParcelOwner'
 import ParcelActions from './ParcelActions'
 import ParcelDescription from './ParcelDescription'
@@ -135,9 +136,14 @@ export default class ParcelDetailPage extends React.PureComponent {
               <Grid.Row>
                 <Grid.Column>
                   <h3>{t('asset_detail.bid.title')}</h3>
-                  {bids.map(bid => (
-                    <Bid key={bid.id} bid={bid} isOwner={isOwner} />
-                  ))}
+                  {bids
+                    .filter(
+                      bid =>
+                        (isOwner && isOpen(bid)) || (!isOwner && isActive(bid))
+                    )
+                    .map(bid => (
+                      <Bid key={bid.id} bid={bid} isOwner={isOwner} />
+                    ))}
                 </Grid.Column>
               </Grid.Row>
             </Grid>
diff --git a/webapp/src/modules/bid/selectors.js b/webapp/src/modules/bid/selectors.js
index 533d0c5bd..0fad310a2 100644
--- a/webapp/src/modules/bid/selectors.js
+++ b/webapp/src/modules/bid/selectors.js
@@ -57,7 +57,7 @@ export const getWalletBidsByAsset = (state, asset, assetType) => {
 
     if (
       isAssetBid(bid, asset.id, assetType) &&
-      bid.status === LISTING_STATUS.open &&
+      isActive(bid) &&
       isBidderOrSeller
     ) {
       return [...bids, bid]