Merge pull request #222 from kaleido-io/tokens-active

Update token pool to use active boolean
hyperledger · Mar 20, 2024 · 7194297 · 7194297
2 parents 9a2b322 + fc0b31b
commit 7194297
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/src/components/Chips/PoolStatusChip.tsx b/src/components/Chips/PoolStatusChip.tsx
@@ -16,7 +16,11 @@
 
 import { Chip } from '@mui/material';
 import React from 'react';
-import { ITokenPool, PoolStateColorMap } from '../../interfaces';
+import {
+  ITokenPool,
+  PoolStateColorMap,
+  PoolStateString,
+} from '../../interfaces';
 
 interface Props {
   pool: ITokenPool;
@@ -25,8 +29,8 @@ interface Props {
 export const PoolStatusChip: React.FC<Props> = ({ pool }) => {
   return (
     <Chip
-      label={pool.state.toLocaleUpperCase()}
-      sx={{ backgroundColor: PoolStateColorMap[pool.state] }}
+      label={PoolStateString(pool.active)}
+      sx={{ backgroundColor: PoolStateColorMap(pool.active) }}
     />
   );
 };
diff --git a/src/components/Lists/PoolList.tsx b/src/components/Lists/PoolList.tsx
@@ -97,7 +97,7 @@ export const PoolList: React.FC<Props> = ({ pool }) => {
         },
         {
           label: t('state'),
-          value: pool.state && <PoolStatusChip pool={pool} />,
+          value: <PoolStatusChip pool={pool} />,
         },
         {
           label: t('created'),

diff --git a/src/interfaces/api.ts b/src/interfaces/api.ts
@@ -551,7 +551,7 @@ export interface ITokenPool {
   locator: string;
   connector: string;
   message: string;
-  state: 'confirmed' | 'pending';
+  active: boolean;
   created: string;
   tx?: ITx;
   info?: any;

diff --git a/src/interfaces/enums/transferTypes.tsx b/src/interfaces/enums/transferTypes.tsx
@@ -19,6 +19,7 @@ import LocalFireDepartmentIcon from '@mui/icons-material/LocalFireDepartment';
 import SwapHorizIcon from '@mui/icons-material/SwapHoriz';
 import { IBlockchainCategory } from '.';
 import { FFColors } from '../../theme';
+import { t } from 'i18next';
 
 export interface IHistTransferBucket {
   [TransferCategoryEnum.MINT]: number;
@@ -37,10 +38,18 @@ export enum TransferCategoryEnum {
   TRANSFER = 'Transfer',
 }
 
-export const PoolStateColorMap: { [key: string]: string } = {
-  unknown: FFColors.Red,
-  confirmed: FFColors.Purple,
-  pending: FFColors.Orange,
+export const PoolStateColorMap = (active: boolean) => {
+  if (active) {
+    return FFColors.Purple;
+  }
+  return FFColors.Orange;
+};
+
+export const PoolStateString = (active: boolean) => {
+  if (active) {
+    return t('active');
+  }
+  return t('inactive');
 };
 
 export enum FF_TRANSFERS {

diff --git a/src/pages/Tokens/views/Pools.tsx b/src/pages/Tokens/views/Pools.tsx
@@ -98,7 +98,7 @@ export const TokensPools: () => JSX.Element = () => {
     t('standard'),
     t('connector'),
     t('locator'),
-    t('state'),
+    t('active'),
     t('created'),
   ];
   const tokenPoolRecords: IDataTableRecord[] | undefined = tokenPools?.map(

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -141,6 +141,7 @@
   "identityID": "Identity ID",
   "identityUpdated": "Identity Updated",
   "in": "In",
+  "inactive": "Inactive",
   "info": "Info",
   "input": "Input",
   "inputOutputDetail": "Input, Output and Detail",