refactor: implement payableAmount in sdk level

and refactor acp job type

Author: Ang-dot

src/acpJob.ts

@@ -32,7 +32,7 @@ class AcpJob {
     public phase: AcpJobPhases,
     public context: Record<string, any>,
     public contractAddress: Address,
-    public netPayableAmount?: number
+    public deliverable?: DeliverablePayload
   ) {
     const content = this.memos.find(
       (m) => m.nextPhase === AcpJobPhases.NEGOTIATION
@@ -85,11 +85,6 @@ class AcpJob {
     return this.acpContractClient.config.baseFare;
   }
 
-  public get deliverable() {
-    return this.memos.find((m) => m.nextPhase === AcpJobPhases.COMPLETED)
-      ?.content;
-  }
-
   public get rejectionReason() {
     const rejectedMemo = this.memos.find(
       (m) =>
@@ -125,6 +120,35 @@ class AcpJob {
     return this.memos[this.memos.length - 1];
   }
 
+  public get netPayableAmount(): number | undefined {
+    const payableMemo = this.memos.find(
+      (m) =>
+        m.nextPhase === AcpJobPhases.TRANSACTION &&
+        m.type === MemoType.PAYABLE_REQUEST &&
+        m.payableDetails
+    );
+
+    if (!payableMemo || !payableMemo.payableDetails) {
+      return undefined;
+    }
+
+    const payableAmount = Number(
+      formatUnits(
+        payableMemo.payableDetails.amount,
+        payableMemo.payableDetails.token.toLowerCase() ===
+          this.baseFare.contractAddress.toLowerCase()
+          ? this.baseFare.decimals
+          : 18 
+      )
+    );
+
+    if (this.priceType === PriceType.PERCENTAGE) {
+      return payableAmount * (1 - this.priceValue);
+    }
+
+    return payableAmount;
+  }
+
   async createRequirement(content: string) {
     const operations: OperationPayload[] = [];
 

src/interfaces.ts

@@ -75,13 +75,12 @@ export interface IAcpJob {
     evaluatorAddress: Address;
     price: number;
     priceTokenAddress: Address;
-    deliverable: DeliverablePayload | null;
     memos: IAcpMemoData[];
     context: Record<string, any>;
     createdAt: string;
     contractAddress: Address;
+    deliverable?: DeliverablePayload;
     memoToSign?: number;
-    netPayableAmount?: number;
   };
   error?: Error;
 }