Merge pull request #1902 from gabrielbazan7/ref/token-transfer

[REF] WC handle sol token transfers

Author: JohnathanWhite

src/store/wallet/effects/send/send.ts

@@ -512,11 +512,11 @@ export const buildTxDetails =
         } else {
           const decodedInstructions = request.decodedInstructions;
           const computUnitLimit =
-            decodedInstructions?.setComputeUnitLimit[0].computeUnitLimit;
+            decodedInstructions?.setComputeUnitLimit?.[0].computeUnitLimit;
           const computeUnitPrice =
-            decodedInstructions?.setComputeUnitPrice[0].microLamports;
+            decodedInstructions?.setComputeUnitPrice?.[0].microLamports;
           const isPriority =
-            decodedInstructions?.setComputeUnitPrice[0].priority;
+            decodedInstructions?.setComputeUnitPrice?.[0].priority;
           const SOL_BASE_FEE_LAMPORTS = 5000; // default base fee in lamports
           if (computUnitLimit && computeUnitPrice && isPriority) {
             fee =
@@ -1084,11 +1084,12 @@ const buildTransactionProposal =
               } else {
                 const decodedInstructions = request.decodedInstructions;
                 const computUnitLimit =
-                  decodedInstructions?.setComputeUnitLimit[0].computeUnitLimit;
+                  decodedInstructions?.setComputeUnitLimit?.[0]
+                    .computeUnitLimit;
                 const computeUnitPrice =
-                  decodedInstructions?.setComputeUnitPrice[0].microLamports;
+                  decodedInstructions?.setComputeUnitPrice?.[0].microLamports;
                 const isPriority =
-                  decodedInstructions?.setComputeUnitPrice[0].priority;
+                  decodedInstructions?.setComputeUnitPrice?.[0].priority;
                 const SOL_BASE_FEE_LAMPORTS = 5000; // default base fee in lamports
                 if (computUnitLimit && computeUnitPrice && isPriority) {
                   txp.fee =

src/utils/helper-methods.ts

@@ -913,11 +913,24 @@ export const processSolanaSwapRequest =
         0,
       );
       currency = 'sol';
+    } else if (
+      instructions?.[instructionKeys.TRANSFER_CHECKED_TOKEN]?.length > 0
+    ) {
+      const checkedTokenTransfer = instructions[
+        instructionKeys.TRANSFER_CHECKED_TOKEN
+      ] as TransferSolInstruction[];
+      mainToAddress = checkedTokenTransfer[0].destination;
+      amount = checkedTokenTransfer.reduce(
+        (sum, transfer) => sum + Number(transfer.amount),
+        0,
+      );
+      tokenAddress = checkedTokenTransfer[0].mint!;
+      currency = (await getSolanaTokenInfo(tokenAddress)).symbol?.toLowerCase();
     }
 
     dispatch(
       LogActions.debug(
-        `amount: ${amount},mainToAddress: ${mainToAddress}, currency: ${currency}, tokenAddress: ${tokenAddress}`,
+        `amount: ${amount}, mainToAddress: ${mainToAddress}, currency: ${currency}, tokenAddress: ${tokenAddress}`,
       ),
     );
 

src/utils/sol-transaction-instruction.types.ts

@@ -3,6 +3,8 @@ export interface TransferSolInstruction {
   currency: 'SOL';
   destination: string;
   source: string;
+  authority?: string;
+  mint?: string;
 }
 
 export interface AdvanceNonceAccountInstruction {