refactor(ui): Update wormhole hooks for SDK client changes

swim-io · Oct 20, 2022 · aab51a6 · aab51a6
1 parent 3995ed3
commit aab51a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/apps/ui/src/hooks/wormhole/useTransferEvmToEvmMutation.ts b/apps/ui/src/hooks/wormhole/useTransferEvmToEvmMutation.ts
@@ -98,15 +98,13 @@ export const useTransferEvmToEvmMutation = () => {
         }),
       );
 
-      const transferTxReceipt = await sourceClient.getTxReceiptOrThrow(
-        transferResponse,
-      );
+      const transferTx = await sourceClient.getTx(transferResponse);
       onTxResult({
         chainId: sourceDetails.chainId,
-        txId: transferTxReceipt.transactionHash,
+        txId: transferTx.id,
       });
       const sequence = parseSequenceFromLogEth(
-        transferTxReceipt,
+        transferTx.receipt,
         sourceChain.wormhole.bridge,
       );
       const retries = getWormholeRetries(sourceDetails.chainId);
@@ -131,10 +129,10 @@ export const useTransferEvmToEvmMutation = () => {
           `Transaction not found: (unlock/mint on ${targetEcosystemId})`,
         );
       }
-      const evmReceipt = await targetClient.getTxReceiptOrThrow(redeemResponse);
+      const redeemTx = await targetClient.getTx(redeemResponse);
       onTxResult({
         chainId: targetDetails.chainId,
-        txId: evmReceipt.transactionHash,
+        txId: redeemTx.id,
       });
     },
   );

diff --git a/apps/ui/src/hooks/wormhole/useTransferEvmToSolanaMutation.ts b/apps/ui/src/hooks/wormhole/useTransferEvmToSolanaMutation.ts
@@ -113,15 +113,13 @@ export const useTransferEvmToSolanaMutation = () => {
         }),
       );
 
-      const transferTxReceipt = await evmClient.getTxReceiptOrThrow(
-        transferResponse,
-      );
+      const transferTx = await evmClient.getTx(transferResponse);
       onTxResult({
         chainId: sourceDetails.chainId,
-        txId: transferTxReceipt.transactionHash,
+        txId: transferTx.id,
       });
       const sequence = parseSequenceFromLogEth(
-        transferTxReceipt,
+        transferTx.receipt,
         evmChain.wormhole.bridge,
       );
 

diff --git a/apps/ui/src/hooks/wormhole/useTransferSolanaToEvmMutation.ts b/apps/ui/src/hooks/wormhole/useTransferSolanaToEvmMutation.ts
@@ -92,8 +92,8 @@ export const useTransferSolanaToEvmMutation = () => {
         txId: transferSplTokenTxId,
       });
 
-      const parsedTx = await solanaClient.getParsedTx(transferSplTokenTxId);
-      const sequence = parseSequenceFromLogSolana(parsedTx);
+      const solanaTx = await solanaClient.getTx(transferSplTokenTxId);
+      const sequence = parseSequenceFromLogSolana(solanaTx.parsedTx);
       const emitterAddress = await getEmitterAddressSolana(
         solanaChain.wormhole.portal,
       );
@@ -118,10 +118,10 @@ export const useTransferSolanaToEvmMutation = () => {
           `Transaction not found: (unlock/mint on ${evmChain.ecosystem})`,
         );
       }
-      const evmReceipt = await evmClient.getTxReceiptOrThrow(redeemResponse);
+      const evmTx = await evmClient.getTx(redeemResponse);
       onTxResult({
         chainId: targetDetails.chainId,
-        txId: evmReceipt.transactionHash,
+        txId: evmTx.id,
       });
     },
   );