Merge pull request #48 from kaleido-io/tokencleanup

Clean up some items around tokens

Author: dechdev

server/src/controllers/tokens.ts

@@ -89,9 +89,17 @@ export class TokensController {
     @QueryParam('pool') pool: string,
     @QueryParam('key') key: string,
   ): Promise<TokenBalance[]> {
+    const poolMap = new Map<string, string>();
     const balances = await firefly.getTokenBalances({ pool, key, balance: '>0' });
+    for (const b of balances) {
+      if (!poolMap.has(b.pool)) {
+        const pool = await firefly.getTokenPool(b.pool);
+        poolMap.set(b.pool, pool.name);
+      }
+    }
     return balances.map((b) => ({
       pool: b.pool,
+      poolName: poolMap.get(b.pool),
       key: b.key,
       balance: b.balance,
       tokenIndex: b.tokenIndex,
@@ -115,7 +123,7 @@ export class TokensTemplateController {
         symbol: <%= ${q('symbol')} %>,
         type: <%= ${q('type')} %>,
       });
-      return { type: 'message', id: pool.message };
+      return { type: 'token_pool', id: pool.id };
     `);
   }
 

server/src/interfaces.ts

@@ -134,6 +134,9 @@ export class TokenBalance {
   @IsUUID()
   pool: string;
 
+  @IsString()
+  poolName: string;
+
   @IsString()
   key: string;
 

server/test/tokens.template.test.ts

@@ -23,7 +23,7 @@ describe('Templates: Tokens', () => {
               symbol: 'P1',
               type: 'fungible',
             });
-            return { type: 'message', id: pool.message };
+            return { type: 'token_pool', id: pool.id };
         `),
         );
       });

server/test/tokens.test.ts

@@ -127,14 +127,15 @@ describe('Tokens', () => {
   });
 
   test('Get balances', async () => {
-    const balances = [{ key: '0x123', balance: '1' } as FireFlyTokenBalance];
+    const balances = [{ key: '0x123', balance: '1', pool: 'pool1' } as FireFlyTokenBalance];
 
+    mockFireFly.getTokenPool.mockResolvedValueOnce({ name: 'pool-name' } as FireFlyTokenPool);
     mockFireFly.getTokenBalances.mockResolvedValueOnce(balances);
 
     await request(server)
       .get('/api/tokens/balances?pool=pool1&key=0x123')
       .expect(200)
-      .expect([{ key: '0x123', balance: '1' }]);
+      .expect([{ key: '0x123', balance: '1', pool: 'pool1', poolName: 'pool-name' }]);
 
     expect(mockFireFly.getTokenBalances).toHaveBeenCalledWith({
       pool: 'pool1',

ui/src/App.tsx

@@ -94,6 +94,12 @@ function App() {
     return createTheme(themeOptions);
   }, []);
 
+  const isFinalEvent = (t: string) => {
+    return (
+      t.endsWith('confirmed') || t.endsWith('rejected') || t.endsWith('failed')
+    );
+  };
+
   const addLogToHistory = (event: IEvent) => {
     setLogHistory((logHistory) => {
       // This is bad practice, and should be optimized in the future
@@ -103,23 +109,23 @@ function App() {
 
       const txMap = deepCopyMap.get(event.tx);
       if (txMap !== undefined) {
+        // TODO: Need better logic
         const isComplete = event.reference === dumbAwaitedEventID;
         if (isComplete) dumbAwaitedEventID = undefined;
 
         return new Map(
           deepCopyMap.set(event.tx, {
             events: [event, ...txMap.events],
             created: event.created,
-            // TODO: Need better logic
-            isComplete,
+            isComplete: isFinalEvent(event.type),
           })
         );
       } else {
         return new Map(
           deepCopyMap.set(event.tx, {
             events: [event],
             created: event.created,
-            isComplete: event.reference === dumbAwaitedEventID,
+            isComplete: isFinalEvent(event.type),
           })
         );
       }

ui/src/components/Accordion/TokensStateAccordion.tsx

@@ -16,7 +16,6 @@ import { SnackbarContext } from '../../contexts/SnackbarContext';
 import { ITokenBalance } from '../../interfaces/api';
 import { fetchCatcher } from '../../utils/fetches';
 import { getShortHash, jsNumberForAddress } from '../../utils/strings';
-import { HashPopover } from '../Popovers/HashPopover';
 import { FFAccordionText } from './FFAccordionText';
 
 export const TokenStateAccordion: React.FC = () => {
@@ -43,12 +42,14 @@ export const TokenStateAccordion: React.FC = () => {
         let balanceMap: {
           [key: string]: { balances: ITokenBalance[] };
         } = {};
-        balanceRes.map((b) => {
-          const balanceArr = balanceMap[b.pool]?.balances ?? [];
-
+        balanceRes.forEach((b) => {
+          if (b.key !== selfIdentity?.ethereum_address) {
+            return;
+          }
+          const balanceArr = balanceMap[b.poolName]?.balances ?? [];
           balanceMap = {
             ...balanceMap,
-            [b.pool]: {
+            [b.poolName]: {
               balances: [...balanceArr, b],
             },
           };
@@ -155,7 +156,7 @@ export const TokenStateAccordion: React.FC = () => {
                         xs={11}
                         alignItems="center"
                       >
-                        <HashPopover address={poolIDKey} />
+                        <Typography>{poolIDKey}</Typography>
                         <Typography
                           sx={{
                             paddingLeft: 2,

ui/src/interfaces/api.ts

@@ -231,6 +231,7 @@ export interface ITokenApproval {
 
 export interface ITokenBalance {
   pool: string;
+  poolName: string;
   key: string;
   balance: string;
   tokenIndex?: string;