chore: first, use an optional parameter

Ticket: WIN-5679

Author: mukeshsp

modules/sdk-coin-sol/src/lib/ataInitializationBuilder.ts

@@ -116,10 +116,10 @@ export class AtaInitializationBuilder extends TransactionBuilder {
     validateOwnerAddress(recipient.ownerAddress);
     const token = getSolTokenFromTokenName(recipient.tokenName);
     let tokenAddress: string;
-    if (token) {
-      tokenAddress = token.tokenAddress;
-    } else if (recipient.tokenAddress) {
+    if (recipient.tokenAddress) {
       tokenAddress = recipient.tokenAddress;
+    } else if (token) {
+      tokenAddress = token.tokenAddress;
     } else {
       throw new BuildTransactionError('Invalid transaction: invalid token name, got: ' + recipient.tokenName);
     }
@@ -148,12 +148,12 @@ export class AtaInitializationBuilder extends TransactionBuilder {
         const token = getSolTokenFromTokenName(recipient.tokenName);
         let tokenAddress: string;
         let programId: string;
-        if (token) {
-          tokenAddress = token.tokenAddress;
-          programId = token.programId;
-        } else if (recipient.tokenAddress && recipient.programId) {
+        if (recipient.tokenAddress && recipient.programId) {
           tokenAddress = recipient.tokenAddress;
           programId = recipient.programId;
+        } else if (token) {
+          tokenAddress = token.tokenAddress;
+          programId = token.programId;
         } else {
           throw new BuildTransactionError('Invalid transaction: invalid token name, got: ' + recipient.tokenName);
         }

modules/sdk-coin-sol/src/lib/solInstructionFactory.ts

@@ -162,15 +162,15 @@ function tokenTransferInstruction(data: TokenTransfer): TransactionInstruction[]
   let tokenAddress: string;
   let programId: string | undefined;
   let decimalPlaces: number;
-  if (token) {
+  if (data.params.tokenAddress && data.params.decimalPlaces) {
+    tokenAddress = data.params.tokenAddress;
+    decimalPlaces = data.params.decimalPlaces;
+    programId = data.params.programId;
+  } else if (token) {
     assert(token instanceof SolCoin);
     tokenAddress = token.tokenAddress;
     decimalPlaces = token.decimalPlaces;
     programId = token.programId;
-  } else if (data.params.tokenAddress && data.params.decimalPlaces) {
-    tokenAddress = data.params.tokenAddress;
-    decimalPlaces = data.params.decimalPlaces;
-    programId = data.params.programId;
   } else {
     throw new Error('Invalid token name, got:' + data.params.tokenName);
   }

modules/sdk-coin-sol/src/lib/tokenTransferBuilder.ts

@@ -96,10 +96,10 @@ export class TokenTransferBuilder extends TransactionBuilder {
     validateOwnerAddress(recipient.ownerAddress);
     const token = getSolTokenFromTokenName(recipient.tokenName);
     let tokenAddress: string;
-    if (token) {
-      tokenAddress = token.tokenAddress;
-    } else if (recipient.tokenAddress) {
+    if (recipient.tokenAddress) {
       tokenAddress = recipient.tokenAddress;
+    } else if (token) {
+      tokenAddress = token.tokenAddress;
     } else {
       throw new BuildTransactionError('Invalid token name, got: ' + recipient.tokenName);
     }
@@ -119,16 +119,16 @@ export class TokenTransferBuilder extends TransactionBuilder {
         let tokenName: string;
         let programId: string | undefined;
         let decimals: number | undefined;
-        if (coin) {
-          tokenAddress = coin.tokenAddress;
-          tokenName = coin.name;
-          programId = coin.programId;
-          decimals = coin.decimalPlaces;
-        } else if (sendParams.tokenAddress) {
+        if (sendParams.tokenAddress && sendParams.programId && sendParams.decimalPlaces) {
           tokenAddress = sendParams.tokenAddress;
           tokenName = sendParams.tokenName;
           programId = sendParams.programId;
           decimals = sendParams.decimalPlaces;
+        } else if (coin) {
+          tokenAddress = coin.tokenAddress;
+          tokenName = coin.name;
+          programId = coin.programId;
+          decimals = coin.decimalPlaces;
         } else {
           throw new Error(`Could not determine token information for ${sendParams.tokenName}`);
         }
@@ -157,14 +157,14 @@ export class TokenTransferBuilder extends TransactionBuilder {
         let tokenAddress: string;
         let tokenName: string;
         let programId: string | undefined;
-        if (coin) {
-          tokenName = coin.name;
-          tokenAddress = coin.tokenAddress;
-          programId = coin.programId;
-        } else if (recipient.tokenAddress) {
+        if (recipient.tokenAddress && recipient.programId) {
           tokenName = recipient.tokenName;
           tokenAddress = recipient.tokenAddress;
           programId = recipient.programId;
+        } else if (coin) {
+          tokenName = coin.name;
+          tokenAddress = coin.tokenAddress;
+          programId = coin.programId;
         } else {
           throw new Error(`Could not determine token information for ${recipient.tokenName}`);
         }

modules/sdk-coin-sol/src/lib/transferBuilderV2.ts

@@ -112,10 +112,10 @@ export class TransferBuilderV2 extends TransactionBuilder {
     validateOwnerAddress(recipient.ownerAddress);
     const token = getSolTokenFromTokenName(recipient.tokenName);
     let tokenAddress;
-    if (token) {
-      tokenAddress = token.tokenAddress;
-    } else if (recipient.tokenAddress) {
+    if (recipient.tokenAddress) {
       tokenAddress = recipient.tokenAddress;
+    } else if (token) {
+      tokenAddress = token.tokenAddress;
     }
 
     if (!tokenAddress) {
@@ -138,16 +138,16 @@ export class TransferBuilderV2 extends TransactionBuilder {
           let tokenName: string;
           let programId: string | undefined;
           let decimals: number | undefined;
-          if (coin) {
-            tokenName = coin.name;
-            tokenAddress = coin.tokenAddress;
-            decimals = coin.decimalPlaces;
-            programId = coin.programId;
-          } else if (sendParams.tokenAddress) {
+          if (sendParams.tokenAddress && sendParams.programId && sendParams.decimalPlaces) {
             tokenName = sendParams.tokenName;
             tokenAddress = sendParams.tokenAddress;
             decimals = sendParams.decimalPlaces;
             programId = sendParams.programId;
+          } else if (coin) {
+            tokenName = coin.name;
+            tokenAddress = coin.tokenAddress;
+            decimals = coin.decimalPlaces;
+            programId = coin.programId;
           } else {
             throw new Error(`Could not determine token information for ${sendParams.tokenName}`);
           }
@@ -187,14 +187,14 @@ export class TransferBuilderV2 extends TransactionBuilder {
         let tokenAddress: string;
         let tokenName: string;
         let programId: string | undefined;
-        if (coin) {
-          tokenName = coin.name;
-          tokenAddress = coin.tokenAddress;
-          programId = coin.programId;
-        } else if (recipient.tokenAddress) {
+        if (recipient.tokenAddress && recipient.programId) {
           tokenName = recipient.tokenName;
           tokenAddress = recipient.tokenAddress;
           programId = recipient.programId;
+        } else if (coin) {
+          tokenName = coin.name;
+          tokenAddress = coin.tokenAddress;
+          programId = coin.programId;
         } else {
           throw new Error(`Could not determine token information for ${recipient.tokenName}`);
         }