Merge pull request #515 from soroswap/fix/hashOnSdexSwap

🩹 Fix copy hash & view on explorer on SDEX swap
soroswap · Aug 21, 2024 · 2161980 · 2161980
2 parents 625621f + 23bb85d
commit 2161980
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/components/Swap/PendingModalContent/index.tsx b/src/components/Swap/PendingModalContent/index.tsx
@@ -121,6 +121,10 @@ interface PendingModalContentProps {
   revocationPending?: boolean;
 }
 
+interface SuccessfullSwapResponseWithSDEXHash extends SuccessfullSwapResponse {
+  hash: string;
+}
+
 interface ContentArgs {
   step: PendingConfirmModalState;
   approvalCurrency?: TokenType;
@@ -130,7 +134,7 @@ interface ContentArgs {
   wrapPending: boolean;
   tokenApprovalPending: boolean;
   revocationPending: boolean;
-  swapResult?: SuccessfullSwapResponse; //SwapResult
+  swapResult?: SuccessfullSwapResponseWithSDEXHash; //SwapResult
   chainId?: number;
   order?: any; //UniswapXOrderDetails
 }
@@ -188,7 +192,7 @@ function getContent(args: ContentArgs): PendingModalStep {
       let label: React.ReactNode | null | string = null;
 
       if (swapConfirmed && swapResult) {
-        label = <CopyTxHash txHash={swapResult?.txHash} />;
+        label = <CopyTxHash txHash={swapResult.txHash ? swapResult.txHash : swapResult.hash} />;
       } else if (swapPending) {
         label = `Proceed in your wallet`;
       }

diff --git a/src/hooks/useSwapCallback.tsx b/src/hooks/useSwapCallback.tsx
@@ -241,7 +241,8 @@ export function useSwapCallback(
               trade.outputAmount?.value ?? '0',
             )} ${trade?.outputAmount?.currency.code}`;
           sendNotification(notificationMessage, 'Swapped', SnackbarIconType.SWAP, SnackbarContext);
-          return result!;
+          if (!result) throw new Error('Cannot create path payment')
+          return result;
         } catch (error: any) {
           console.error(error);
           throw new Error('Cannot create path payment');