Merge pull request #21 from FLock-io/fix/ui-fixes

Fix/UI fixes
FLock-io · Aug 29, 2023 · 73d2af1 · 73d2af1
2 parents b3ffe67 + 758fa17
commit 73d2af1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 38 deletions.
diff --git a/build/bin/main.bin b/build/bin/main.bin
diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
@@ -241,7 +241,7 @@ function Task({ task, goBack }: TaskProps) {
             ) : (
               <LogViewer
                 hasLineNumbers={false}
-                height={460}
+                height={390}
                 data={logs.get(task.address)}
               />
             )}
@@ -256,35 +256,38 @@ function Task({ task, goBack }: TaskProps) {
                 <Heading level={4}>Rounds and Balance Record</Heading>
               </Box>
 
-              <DataTable
-                columns={[
-                  {
-                    align: 'center',
-                    property: 'round',
-                    header: 'Round',
-                    primary: true,
-                  },
-                  {
-                    align: 'center',
-                    property: 'role',
-                    header: 'Role',
-                    render: (datum) => (
-                      <Text>{datum.role === '1' ? 'Voter' : 'Proposer'} </Text>
-                    ),
-                  },
-                  {
-                    align: 'center',
-                    property: 'token',
-                    header: 'Token Change',
-                  },
-                  {
-                    align: 'center',
-                    property: 'balance',
-                    header: 'Round Balance',
-                  },
-                ]}
-                data={finalDataForReport}
-              />
+              <Box overflow="auto" height="300px">
+                <DataTable
+                  pin
+                  columns={[
+                    {
+                      align: 'center',
+                      property: 'round',
+                      header: 'Round',
+                      primary: true,
+                    },
+                    {
+                      align: 'center',
+                      property: 'role',
+                      header: 'Role',
+                      render: (datum) => (
+                        <Text>{datum.role === '1' ? 'Voter' : 'Proposer'} </Text>
+                      ),
+                    },
+                    {
+                      align: 'center',
+                      property: 'token',
+                      header: 'Token Change',
+                    },
+                    {
+                      align: 'center',
+                      property: 'balance',
+                      header: 'Round Balance',
+                    },
+                  ]}
+                  data={finalDataForReport}
+                />
+              </Box>
             </Box>
             <Box gap="medium">
               <Box>

diff --git a/src/renderer/hooks/useTaskData.ts b/src/renderer/hooks/useTaskData.ts
@@ -84,7 +84,8 @@ export const useTaskData = ({
   };
 
   const totalRewardedAmount = participantRewardedAmounts.reduce(
-    (partialSum, a) => Number(partialSum) + Number(a),
+    (partialSum, a) =>
+      Number(formatUnits(partialSum, 18)) + Number(formatUnits(a, 18)),
     0
   );
 
@@ -128,7 +129,7 @@ export const useTaskData = ({
         args: [i],
       }) as Promise<bigint>;
       // eslint-disable-next-line no-await-in-loop
-      result.push({ round: i, accuracy: Number(await data) });
+      result.push({ round: i + 1, accuracy: Number(await data) / 10000 });
     }
     setAccuracies(result);
   };
@@ -142,14 +143,13 @@ export const useTaskData = ({
 
   const finalDataForReport = [];
 
-  for (let index = 0; index < participantRewardedAmounts.length; index++) {
-    const element = participantRewardedAmounts[index];
+  for (let index = 0; index < participantRoundBalance.length; index++) {
     let tokenChangePercentage = '0%'; // Default value for the first element and when previous "token" is zero
-    let currentToken = element;
+    const currentToken = participantRoundBalance[index];
     let prevToken = 0n;
     index > 0
-      ? (prevToken = participantRewardedAmounts[index - 1])
-      : (prevToken = participantRewardedAmounts[index]);
+      ? (prevToken = participantRoundBalance[index - 1])
+      : (prevToken = participantRoundBalance[index]);
 
     if (prevToken !== 0n) {
       const tokenChange = ((currentToken - prevToken) / prevToken) * 100n;
@@ -164,7 +164,7 @@ export const useTaskData = ({
       token: tokenChangePercentage,
       balance: participantRoundBalance[index]
         ? formatUnits(participantRoundBalance[index], 18)
-        : '',
+        : '0',
     });
   }