Develop to preprod: Fix PR#135

.env.sample

@@ -1,8 +1,17 @@
 BUILD_ENV=
-COMMUNITY_API_KEY=
+REALTOKEN_COMMUNITY_API_KEY=
 THEGRAPH_API_KEY=
-REALTOKENAPI='https://api.realtoken.community/v1/token'
-REALTOKENAPI_HISTORY='https://history.api.realtoken.community/'
+
+REALTOKEN_COMMUNITY_API_BASE='https://api.realtoken.community/'
+REALTOKEN_COMMUNITY_API_VERSION='v1'
+REALTOKEN_COMMUNITY_API_GET_ALLTOKENS='token'
+REALTOKEN_COMMUNITY_API_HISTORY_BASE='https://history.api.realtoken.community/'
+
+PITSBI_API_BASE='https://api.pitsbi.io/'
+PITSBI_API_VERSION='api'
+PITSBI_API_GET_LASTUPDATE='last_get_realTokens_communityDashboard'
+PITSBI_API_GET_ALLTOKENS='realTokens_communityDashboard'
+
 MATOMO_URL='https://data.realtoken.community/'
 MATOMO_SITE_ID=
 

.github/workflows/branch.yml

@@ -77,7 +77,7 @@ jobs:
           DOCKER_PASSWD: ${{ secrets.DOCKER_PASSWD }}
           DOMAIN_URL: ${{ secrets.DOMAIN_URL }}
           THEGRAPH_API_KEY: ${{ secrets.THEGRAPH_API_KEY }}
-          COMMUNITY_API_KEY: ${{ secrets.COMMUNITY_API_KEY }}
+          REALTOKEN_COMMUNITY_API_KEY: ${{ secrets.REALTOKEN_COMMUNITY_API_KEY }}
           RPC_URLS_ETH_MAINNET: ${{ secrets.RPC_URLS_ETH_MAINNET }}
           RPC_URLS_GNOSIS_MAINNET: ${{ secrets.RPC_URLS_GNOSIS_MAINNET }}
           MATOMO_ID_PROD: ${{ secrets.MATOMO_ID_PROD }}
@@ -106,9 +106,15 @@ jobs:
             docker login -u "$DOCKER_LOGIN" -p "$DOCKER_PASSWD" \$DOCKER_REGISTRY
 
             THEGRAPH_API_KEY="$THEGRAPH_API_KEY" \
-            COMMUNITY_API_KEY="$COMMUNITY_API_KEY" \
-            REALTOKENAPI="https://api.$DOMAIN_URL/v1/token" \
-            REALTOKENAPI_HISTORY="https://history.api.$DOMAIN_URL/" \
+            REALTOKEN_COMMUNITY_API_KEY="$REALTOKEN_COMMUNITY_API_KEY" \
+            REALTOKEN_COMMUNITY_API_BASE="https://api.$DOMAIN_URL" \
+            REALTOKEN_COMMUNITY_API_VERSION='v1' \
+            REALTOKEN_COMMUNITY_API_GET_ALLTOKENS='token' \
+            REALTOKEN_COMMUNITY_API_HISTORY_BASE="https://history.api.$DOMAIN_URL/" \
+            PITSBI_API_BASE="https://api.pitsbi.io/" \
+            PITSBI_API_VERSION='api' \
+            PITSBI_API_GET_LASTUPDATE='last_get_realTokens_communityDashboard' \
+            PITSBI_API_GET_ALLTOKENS='realTokens_communityDashboard' \
             MATOMO_URL="https://data.$DOMAIN_URL/" \
             MATOMO_SITE_ID="$MATOMO_SITE_ID" \
             RPC_URLS_ETH_MAINNET="$RPC_URLS_ETH_MAINNET" \

README.md

@@ -2,7 +2,6 @@
 
 ## TODO
 
-- [x] Use Community API to get RealTokens data (and remove public/mock/realt.min.json)
 - [x] Display assets in a table
 - [x] Allow to sort assets
 - [ ] Create Readme
@@ -16,7 +15,7 @@
 
 To run the project you will need to set-up a `.env` file in the root folder, by copy/paste `.env.sample` file.
 
-To get a `COMMUNITY_API_KEY`, join the dedicated [telegram dev channel](https://t.me/+XQyoaFfmN61yk7X0) then ask for.
+To get a `REALTOKEN_COMMUNITY_API_KEY`, join the dedicated [telegram dev channel](https://t.me/+XQyoaFfmN61yk7X0) then ask for.
 
 To get a `THEGRAPH_API_KEY`, you need to create an account on [thegraph](https://thegraph.com/docs/en/querying/managing-api-keys/)
 

docker-compose-branch.yml

@@ -4,9 +4,16 @@ services:
     container_name: ${DOCKER_BRANCH}-dashboard
     environment:
       - THEGRAPH_API_KEY=$THEGRAPH_API_KEY
-      - COMMUNITY_API_KEY=$COMMUNITY_API_KEY
-      - REALTOKENAPI=$REALTOKENAPI
-      - REALTOKENAPI_HISTORY=$REALTOKENAPI_HISTORY
+      - REALTOKEN_COMMUNITY_API_KEY=$REALTOKEN_COMMUNITY_API_KEY
+
+      - REALTOKEN_COMMUNITY_API_BASE=$REALTOKEN_COMMUNITY_API_BASE
+      - REALTOKEN_COMMUNITY_API_VERSION=$REALTOKEN_COMMUNITY_API_VERSION
+      - REALTOKEN_COMMUNITY_API_GET_ALLTOKENS=$REALTOKEN_COMMUNITY_API_GET_ALLTOKENS
+      - REALTOKEN_COMMUNITY_API_HISTORY_BASE=$REALTOKEN_COMMUNITY_API_HISTORY_BASE
+      - PITSBI_API_BASE
+      - PITSBI_API_VERSION
+      - PITSBI_API_GET_LASTUPDATE
+      - PITSBI_API_GET_ALLTOKENS
       - MATOMO_URL=$MATOMO_URL
       - MATOMO_SITE_ID=$MATOMO_SITE_ID
       - RPC_URLS_ETH_MAINNET=$RPC_URLS_ETH_MAINNET

package.json

@@ -28,14 +28,16 @@
     "@realtoken/realt-commons": "1.4.20",
     "@reduxjs/toolkit": "^2.8.2",
     "@socialgouv/matomo-next": "^1.9.2",
-    "@tabler/icons": "^1.119.0",
+    "@uniswap/sdk-core": "^7.7.2",
+    "@uniswap/v3-sdk": "^3.25.2",
+    "@tabler/icons-react": "^3.34.1",
     "@web3-react/core": "^8.2.3",
     "cookies-next": "^2.1.2",
     "date-fns": "^3.6.0",
     "dayjs": "^1.11.13",
     "del-cli": "^6.0.0",
     "dexie": "^3.2.7",
-    "ethers": "^6.14.1",
+    "ethers": "^6.15.0",
     "graphql": "^16.11.0",
     "i18next": "^22.5.1",
     "jotai": "^1.13.1",

src/components/assetPage/assetPageIssuesTab.tsx

@@ -0,0 +1,62 @@
+import { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { UserRealtoken } from 'src/store/features/wallets/walletsSelector'
+import { RealTokenToBeFixedStatus } from 'src/types/APIPitsBI'
+
+import { AssetPageTable } from './assetPageTable'
+
+export const AssetPageIssuesTab: FC<{
+  realtoken: UserRealtoken
+}> = ({ realtoken }) => {
+  const { t } = useTranslation('common', { keyPrefix: 'assetPage.issues' })
+  const { t: tAssetIssues } = useTranslation('common', {
+    keyPrefix: 'assetIssues',
+  })
+
+  const statusLabel = () => {
+    switch (realtoken.extraData?.pitsBI?.actions?.realt_status) {
+      case RealTokenToBeFixedStatus.NoExhibit:
+        return tAssetIssues('status.noExhibit')
+      case RealTokenToBeFixedStatus.Scheduled:
+        return tAssetIssues('status.scheduled')
+      case RealTokenToBeFixedStatus.UpgradedAndReady:
+        return tAssetIssues('status.upgradedReady')
+      case undefined:
+      default:
+        return tAssetIssues('status.unknown')
+    }
+  }
+
+  return (
+    <>
+      <AssetPageTable
+        data={[
+          {
+            label: t('status'),
+            value: statusLabel(),
+          },
+          {
+            label: t('priority'),
+            value:
+              realtoken.extraData?.pitsBI?.actions?.priority === undefined
+                ? tAssetIssues('priority.unknown')
+                : realtoken.extraData?.pitsBI?.actions?.priority !== 0
+                  ? `${realtoken.extraData?.pitsBI?.actions?.priority}`
+                  : tAssetIssues('priority.na'),
+          },
+          {
+            label: t('lawsuit'),
+            value:
+              realtoken.extraData?.pitsBI?.actions?.exhibit_number &&
+              realtoken.extraData?.pitsBI?.actions?.volume
+                ? `${tAssetIssues('lawsuit.exhibit')} ${tAssetIssues('lawsuit.exhibitNumber')} ${realtoken.extraData?.pitsBI?.actions?.exhibit_number} ${tAssetIssues('lawsuit.volumeNumber')} ${realtoken.extraData?.pitsBI?.actions?.volume}`
+                : tAssetIssues('lawsuit.na'),
+          },
+        ]}
+      />
+    </>
+  )
+}
+
+AssetPageIssuesTab.displayName = 'AssetPageIssuesTab'

src/components/assetsView/filters/AssetsViewFilterModal.tsx

@@ -14,10 +14,13 @@ import {
   assetsViewFilterAtom,
 } from 'src/states'
 import { selectUserIncludesOtherAssets } from 'src/store/features/settings/settingsSelector'
+import { selectUserDisplayAdditionalData } from 'src/store/features/settings/settingsSelector'
 import { userIncludesOtherAssetsChanged } from 'src/store/features/settings/settingsSlice'
 
 import { AssetProductType } from '../types'
 import { AssetsViewProductTypeFilter } from './AssetsViewFilterProductType'
+import { AssetsViewIssuePriorityFilter } from './AssetsViewIssuePriorityFilter'
+import { AssetsViewIssueStatusFilter } from './AssetsViewIssuesStatusFilter'
 import { AssetsViewRentStatusFilter } from './AssetsViewRentStatusFilter'
 import { AssetsViewRmmStatusFilter } from './AssetsViewRmmStatusFilter'
 import { AssetsViewSort } from './AssetsViewSort'
@@ -59,6 +62,7 @@ export const AssetsViewFilterModal: FC<ContextModalProps> = ({
   const dispatch = useDispatch()
   const setUserIncludesOtherAssets = (value: boolean) =>
     dispatch(userIncludesOtherAssetsChanged(value))
+  const userDisplayAdditionalData = useSelector(selectUserDisplayAdditionalData)
 
   const onClose = useCallback(() => {
     context.closeModal(id)
@@ -123,6 +127,22 @@ export const AssetsViewFilterModal: FC<ContextModalProps> = ({
             setFilterModel({ ...filterModel, ...value })
           }}
         />
+        {userDisplayAdditionalData && (
+          <>
+            <AssetsViewIssueStatusFilter
+              filter={filterModel}
+              onChange={(value) => {
+                setFilterModel({ ...filterModel, ...value })
+              }}
+            />
+            <AssetsViewIssuePriorityFilter
+              filter={filterModel}
+              onChange={(value) => {
+                setFilterModel({ ...filterModel, ...value })
+              }}
+            />
+          </>
+        )}
       </Flex>
       <Flex justify={'space-between'}>
         <ResetFilterButton onClick={onClose} />

src/components/assetsView/filters/AssetsViewIssuePriorityFilter.tsx

@@ -0,0 +1,106 @@
+import { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { Select } from '@mantine/core'
+
+import { assetsViewDefaultFilter } from 'src/states'
+import {
+  OtherRealtoken,
+  UserRealtoken,
+} from 'src/store/features/wallets/walletsSelector'
+import { RealTokenToBeRepairedPriority } from 'src/types/APIPitsBI'
+
+import { useInputStyles } from '../../inputs/useInputStyles'
+import { AssetIssuePriorityType } from '../types'
+
+interface AssetsViewIssuePriorityFilterModel {
+  issuePriority: AssetIssuePriorityType
+}
+
+interface AssetsViewIssuePriorityFilterProps {
+  filter: AssetsViewIssuePriorityFilterModel
+  onChange: (value: AssetsViewIssuePriorityFilterModel) => void
+}
+export const AssetsViewIssuePriorityFilter: FC<
+  AssetsViewIssuePriorityFilterProps
+> = ({ filter, onChange }) => {
+  const { t } = useTranslation('common', { keyPrefix: 'assetIssuePriority' })
+  const { classes: inputClasses } = useInputStyles()
+
+  const viewOptions = [
+    {
+      value: AssetIssuePriorityType.ALL,
+      label: t('options.all'),
+    },
+    {
+      value: AssetIssuePriorityType.NONE,
+      label: t('options.none'),
+    },
+    {
+      value: AssetIssuePriorityType.HIGH,
+      label: t('options.high'),
+    },
+    {
+      value: AssetIssuePriorityType.MEDIUM,
+      label: t('options.medium'),
+    },
+    {
+      value: AssetIssuePriorityType.LOW,
+      label: t('options.low'),
+    },
+  ]
+
+  return (
+    <Select
+      label={t('label')}
+      data={viewOptions}
+      value={filter.issuePriority}
+      onChange={(value) =>
+        onChange({
+          issuePriority:
+            (value as AssetIssuePriorityType) ??
+            assetsViewDefaultFilter.issuePriority,
+        })
+      }
+      classNames={inputClasses}
+    />
+  )
+}
+AssetsViewIssuePriorityFilter.displayName = 'AssetsViewIssuePriorityFilter'
+
+export function useAssetsViewIssuePriorityFilter(
+  filter: AssetsViewIssuePriorityFilterModel,
+) {
+  function assetIssuePriorityFilterFunction(
+    asset: UserRealtoken | OtherRealtoken,
+  ) {
+    const Asset = asset as UserRealtoken
+    switch (filter.issuePriority) {
+      case AssetIssuePriorityType.ALL:
+        return true
+      case AssetIssuePriorityType.NONE:
+        return (
+          Asset.extraData?.pitsBI?.actions?.priority ===
+            RealTokenToBeRepairedPriority.None ||
+          Asset.extraData?.pitsBI?.actions?.priority === undefined
+        )
+      case AssetIssuePriorityType.HIGH:
+        return (
+          Asset.extraData?.pitsBI?.actions?.priority ===
+          RealTokenToBeRepairedPriority.High
+        )
+      case AssetIssuePriorityType.MEDIUM:
+        return (
+          Asset.extraData?.pitsBI?.actions?.priority ===
+          RealTokenToBeRepairedPriority.Medium
+        )
+      case AssetIssuePriorityType.LOW:
+        return (
+          Asset.extraData?.pitsBI?.actions?.priority ===
+          RealTokenToBeRepairedPriority.Low
+        )
+    }
+  }
+
+  return { assetIssuePriorityFilterFunction }
+}