Skip to content

Commit

Permalink
very small refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
popenta committed Jul 4, 2024
1 parent 969d0df commit 2a46daf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,7 @@ export class SmartContractTransactionsFactory {
let numberOfTokens = tokenTransfers.length;

if (nativeTransferAmount && numberOfTokens) {
const nativeTransfer = TokenTransfer.newFromEgldAmount(nativeTransferAmount);
tokenTransfers.push(nativeTransfer);

tokenTransfers.push(TokenTransfer.newFromEgldAmount(nativeTransferAmount));
nativeTransferAmount = 0n;
numberOfTokens++;
}
Expand Down
8 changes: 5 additions & 3 deletions src/transactionsFactories/transferTransactionsFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ export class TransferTransactionsFactory {
let tokenTransfers = options.tokenTransfers ? [...options.tokenTransfers] : [];
const numberOfTokens = tokenTransfers.length;

if (!nativeAmount && !numberOfTokens) {
if (!nativeAmount && numberOfTokens === 0) {
throw new ErrBadUsage("No native token amount or token transfers provided");
}

if (numberOfTokens && options.data?.length) {
throw new ErrBadUsage("Can't set data field when sending esdt tokens");
}

if (nativeAmount && !tokenTransfers) {
if (nativeAmount && numberOfTokens === 0) {
return this.createTransactionForNativeTokenTransfer({
sender: options.sender,
receiver: options.receiver,
Expand All @@ -173,7 +173,9 @@ export class TransferTransactionsFactory {
}

const nativeTransfer = nativeAmount ? TokenTransfer.newFromEgldAmount(nativeAmount) : undefined;
nativeTransfer ? tokenTransfers.push(nativeTransfer) : null;
if (nativeTransfer) {
tokenTransfers.push(nativeTransfer);
}

return this.createTransactionForESDTTokenTransfer({
sender: options.sender,
Expand Down

0 comments on commit 2a46daf

Please sign in to comment.