WIP: 3a1a3cd refactor: update token decimals handling and improve input validation in payment forms (#3200)

Author: flopez7

packages/apps/job-launcher/client/src/components/Jobs/Table.tsx

@@ -62,7 +62,8 @@ export const JobTable = ({
         {
           id: 'fundAmount',
           label: 'Fund Amount',
-          render: ({ fundAmount }) => `${fundAmount} HMT`,
+          render: ({ fundAmount, currency }) =>
+            `${Number(fundAmount)} ${currency.toUpperCase()}`,
         },
         { id: 'status', label: 'Status' },
         {

packages/apps/job-launcher/client/src/pages/Job/JobDetail/index.tsx

@@ -133,11 +133,11 @@ export default function JobDetail() {
                 />
                 <CardTextRow
                   label="Balance"
-                  value={`${data.details.balance} HMT`}
+                  value={`${data.details.balance} ${(data.details.currency ?? '').toUpperCase()}`}
                 />
                 <CardTextRow
-                  label="Paid Out HMT"
-                  value={`${data.details.paidOut.toString()} HMT`}
+                  label="Paid Out"
+                  value={`${data.details.paidOut.toString()} ${data.details.currency ?? ''.toUpperCase()}`}
                 />
               </Stack>
             </CardContainer>
@@ -180,7 +180,7 @@ export default function JobDetail() {
                     />
                     <CardTextRow
                       label="Fund Amount"
-                      value={`${data.manifest.fundAmount.toString()} HMT`}
+                      value={`${data.manifest.fundAmount.toString()} ${data.details.currency ?? ''.toUpperCase()}`}
                     />
                   </Stack>
                 </Grid>

packages/apps/job-launcher/client/src/types/index.ts

@@ -263,6 +263,7 @@ export type JobDetailsResponse = {
     manifestHash: string;
     balance: number;
     paidOut: number;
+    currency?: string;
     status: string;
   };
   manifest: {

packages/apps/job-launcher/server/src/modules/job/job.dto.ts

@@ -328,6 +328,12 @@ export class CommonDetails {
   @Min(0)
   public paidOut: number;
 
+  @ApiProperty({
+    description: 'Currency of the job',
+  })
+  @IsEnumCaseInsensitive(EscrowFundToken)
+  public currency?: EscrowFundToken;
+
   @ApiProperty({
     description: 'Number of tasks (optional)',
     name: 'amount_of_tasks',
@@ -477,6 +483,9 @@ export class JobListDto {
   @ApiProperty({ name: 'fund_amount' })
   public fundAmount: number;
 
+  @ApiProperty()
+  public currency: EscrowFundToken;
+
   @ApiProperty()
   public status: JobStatus;
 }

packages/apps/job-launcher/server/src/modules/job/job.service.ts

@@ -1283,6 +1283,7 @@ export class JobService {
           escrowAddress: job.escrowAddress,
           network: NETWORKS[job.chainId as ChainId]!.title,
           fundAmount: job.fundAmount,
+          currency: job.token as EscrowFundToken,
           status: job.status,
         };
       });
@@ -1615,6 +1616,7 @@ export class JobService {
         manifestHash,
         balance: Number(ethers.formatEther(escrow?.balance || 0)),
         paidOut: Number(ethers.formatEther(escrow?.amountPaid || 0)),
+        currency: jobEntity.token as EscrowFundToken,
         status: jobEntity.status,
         failedReason: jobEntity.failedReason,
       },