refactor: isReturn and total methods (#106)

ArdentHQ · Nov 6, 2024 · c051445 · c051445
1 parent 431158d
commit c051445
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 3 deletions.
diff --git a/packages/ark/source/confirmed-transaction.dto.ts b/packages/ark/source/confirmed-transaction.dto.ts
@@ -63,7 +63,16 @@ export class ConfirmedTransactionData extends DTO.AbstractConfirmedTransactionDa
 		}
 
 		if (this.isMultiPayment()) {
-			return this.recipients().some(({ address }: Contracts.MultiPaymentRecipient) => address === this.sender());
+			let isReturn = true;
+
+			for (const recipient of this.recipients().values()) {
+				if (recipient.address !== this.sender()) {
+					isReturn = false;
+					break;
+				}
+			}
+
+			return isReturn;
 		}
 
 		return false;

diff --git a/packages/profiles/source/signed-transaction.dto.ts b/packages/profiles/source/signed-transaction.dto.ts
@@ -59,7 +59,24 @@ export class ExtendedSignedTransactionData {
 	}
 
 	public isReturn(): boolean {
-		return this.isSent() && this.isReceived();
+		if (this.isTransfer()) {
+			return this.isSent() && this.isReceived();
+		}
+
+		if (this.isMultiPayment()) {
+			let isReturn = true;
+
+			for (const recipient of this.recipients().values()) {
+				if (recipient.address !== this.sender()) {
+					isReturn = false;
+					break;
+				}
+			}
+
+			return isReturn;
+		}
+
+		return false;
 	}
 
 	public isSent(): boolean {
@@ -131,11 +148,25 @@ export class ExtendedSignedTransactionData {
 	}
 
 	public total(): number {
+		if (this.isReturn()) {
+			return this.amount() - this.fee();
+		}
+
 		if (this.isSent()) {
 			return this.amount() + this.fee();
 		}
 
-		return this.amount();
+		let total = this.amount();
+
+		if (this.isMultiPayment()) {
+			for (const recipient of this.recipients()) {
+				if (recipient.address !== this.wallet().address()) {
+					total -= recipient.amount;
+				}
+			}
+		}
+
+		return total;
 	}
 
 	public convertedTotal(): number {

diff --git a/packages/profiles/source/transaction.dto.test.ts b/packages/profiles/source/transaction.dto.test.ts
@@ -26,6 +26,7 @@ const createSubject = (wallet, properties, klass) => {
 		getMeta: () => meta,
 		id: () => "transactionId",
 		inputs: () => [],
+		isReturn: () => false,
 		isSent: () => true,
 		memo: () => "memo",
 		outputs: () => [],
@@ -313,6 +314,7 @@ describe("ExtendedConfirmedTransactionData", ({ beforeEach, it, assert, stub, sp
 			amount: () => BigNumber.make(18e8, 8),
 			fee: () => BigNumber.make(2e8, 8),
 			isMultiPayment: () => false,
+			isReturn: () => false,
 			isSent: () => false,
 		});
 
@@ -324,6 +326,7 @@ describe("ExtendedConfirmedTransactionData", ({ beforeEach, it, assert, stub, sp
 			amount: () => BigNumber.make(18e8, 8),
 			fee: () => BigNumber.make(2e8, 8),
 			isMultiPayment: () => true,
+			isReturn: () => false,
 			isSent: () => false,
 			recipients: () => [
 				{

diff --git a/packages/profiles/source/transaction.dto.ts b/packages/profiles/source/transaction.dto.ts
@@ -261,6 +261,10 @@ export class ExtendedConfirmedTransactionData implements Contracts.ConfirmedTran
 	 */
 
 	public total(): number {
+		if (this.isReturn()) {
+			return this.amount() - this.fee();
+		}
+
 		if (this.isSent()) {
 			return this.amount() + this.fee();
 		}