merge master in develop (#103)

* Revert "Master"

* merge preprod <> master (#67)

* add dropdown

* simplify selector and add all token option

* feat: change allPage value to Infinity

* feat: estimate the fully rented rent

* feat: add fully rented estimation to asset cards

* refactor: move hook calls to top of the page

* fix: propInfo definition

* fix: last rent condition

* feat: add estimation for property with not fully rented history

* feat: get fully rented APR

* apply max APR method

* rename variable and functions

* feat: add RWA token

* feat: re-enable property onClick

* feat: add rwa valuation on the rwa card

* fix: missing property

* feat: add rwa to summary card

* define useRWA

* take into account user currency

* feat: add RWA value to net value calculation

* remove comment

* refactor: clean imports

* feat: include RWA on Ethereum

* fix: en communs

* feat: update filter to support RWA token

* fix: prettier

* fix: other prettier errors

* let prettier add strange semi-column

* fix: imports

* use hook

* add fallback

* switch for a useMemo

* feat: add real time fully rented APR

* feat: add gloabl metric fully rented APR

* feat: add disclaimer

* feat: add disclaimer

* feat: update disclaimer message

* fix: disclaimer message

* improve message

* feat: create yam statics stics page

* feat: add yam statistics for all RealT Tokens on Gnosis (who have Gnosis chain contract prop)

* feat: mask tokens with no volume

* fix: add token name

* feat: add pagination

* feat: improve style

* feat: change token per page to 100

* feat: add fully rented APR to asset grid

* refactor: remove logs

* feat: add fully rented APR to property details

* fix: reset current page when tokens changed

* fix: reset current page when user change page size

* feat: add translation for YAM statistics hearder label

* fix: yamStatistics: use selected currency for token price

* feat: yamStatistics: add owned | all filter

* feat: yamStatistics: add subsidized, fullySubsidized and notSubsidized filters

* add additional fallbacks RPC URLs

* fix: RPC initialization on currencies file

---------

Co-authored-by: Nandy Bâ <[email protected]>

* merge preprod <> master (#77)

* add dropdown

* simplify selector and add all token option

* feat: change allPage value to Infinity

* feat: estimate the fully rented rent

* feat: add fully rented estimation to asset cards

* refactor: move hook calls to top of the page

* fix: propInfo definition

* fix: last rent condition

* feat: add estimation for property with not fully rented history

* feat: get fully rented APR

* apply max APR method

* rename variable and functions

* feat: add RWA token

* feat: re-enable property onClick

* feat: add rwa valuation on the rwa card

* fix: missing property

* feat: add rwa to summary card

* define useRWA

* take into account user currency

* feat: add RWA value to net value calculation

* remove comment

* refactor: clean imports

* feat: include RWA on Ethereum

* fix: en communs

* feat: update filter to support RWA token

* fix: prettier

* fix: other prettier errors

* let prettier add strange semi-column

* fix: imports

* use hook

* add fallback

* switch for a useMemo

* feat: add real time fully rented APR

* feat: add gloabl metric fully rented APR

* feat: add disclaimer

* feat: add disclaimer

* feat: update disclaimer message

* fix: disclaimer message

* improve message

* feat: create yam statics stics page

* feat: add yam statistics for all RealT Tokens on Gnosis (who have Gnosis chain contract prop)

* feat: mask tokens with no volume

* fix: add token name

* feat: add pagination

* feat: improve style

* feat: change token per page to 100

* feat: add fully rented APR to asset grid

* refactor: remove logs

* feat: add fully rented APR to property details

* fix: reset current page when tokens changed

* fix: reset current page when user change page size

* feat: add translation for YAM statistics hearder label

* fix: yamStatistics: use selected currency for token price

* feat: yamStatistics: add owned | all filter

* feat: yamStatistics: add subsidized, fullySubsidized and notSubsidized filters

* add additional fallbacks RPC URLs

* fix: RPC initialization on currencies file

* feat: YamStatistic: add Yamp Volume's number of days

* fix: fullyRentedAPR: fix french disclaimer text

* fix: second disclaimer text small error

* feat: fullyRentedAPR: manage VEFA properties

* refactore: improve comment

* feat: show VEFA properties forced fully rented APR only if property do not have tenants

* fix: RWA table view

* feat: add bridge link on header (#74)

* fix: VEFA Realtime  APR

---------

Co-authored-by: Nandy Bâ <[email protected]>
Co-authored-by: Yohann Durand <[email protected]>

* Revert "merge preprod <> master (#77)"

This reverts commit 68daad5.

* fix: APY fully rented for properties before start rent day (#85)

Co-authored-by: alex <[email protected]>

* Change NS for RealToken (#89) (#90)

---------

Co-authored-by: Sigri <[email protected]>
Co-authored-by: Kurtisone <[email protected]>
Co-authored-by: jycssu-com <[email protected]>
Co-authored-by: alex <[email protected]>
Co-authored-by: Jycssu <[email protected]>
Co-authored-by: Yohann Durand <[email protected]>

Author: 6 people

src/hooks/useFullyRentedAPR.ts

@@ -19,8 +19,8 @@ const fullyRentedAPREstimation = (
     return getVEFAFullRentedAPR(token, rentCalculation)
   }
 
+  // Case of fully rented property
   if (token.rentedUnits === token.totalUnits) {
-    // Case of fully rented property
     return token.annualPercentageYield
   }