Merge branch 'sentry'

sushi-labs · Oct 1, 2024 · c64f281 · c64f281
2 parents 78f46a8 + bf5c36a
commit c64f281
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs
@@ -132,4 +132,7 @@ export default withSentryConfig(nextConfig, {
   // https://docs.sentry.io/product/crons/
   // https://vercel.com/docs/cron-jobs
   automaticVercelMonitors: true,
+
+  // Disables Sentry's telemetry features
+  telemetry: false,
 })
diff --git a/apps/web/src/lib/hooks/useSimulateTrade.ts b/apps/web/src/lib/hooks/useSimulateTrade.ts
@@ -42,8 +42,9 @@ export function useSimulateTrade({
           trade &&
           typeof trade.tokenTax === 'undefined' &&
           isMinOutError(error)
-        )
+        ) {
           return false
+        }
         return i < 3
       },
       enabled:

diff --git a/apps/web/src/ui/swap/simple/simple-swap-trade-review-dialog.tsx b/apps/web/src/ui/swap/simple/simple-swap-trade-review-dialog.tsx
@@ -100,6 +100,7 @@ export const SimpleSwapTradeReviewDialog: FC<{
         trade?.tokenTax instanceof Percent
           ? trade.tokenTax.toPercentageString()
           : trade?.tokenTax,
+      tx: trade.tx,
     })
   }, [trade, chainId])
 
@@ -151,9 +152,8 @@ export const SimpleSwapTradeReviewDialog: FC<{
 
       try {
         const ts = new Date().getTime()
-        const receiptPromise = client.waitForTransactionReceipt({
+        const promise = client.waitForTransactionReceipt({
           hash,
-          retryCount: 30,
         })
 
         sendAnalyticsEvent(SwapEventName.SWAP_SIGNED, {
@@ -167,7 +167,7 @@ export const SimpleSwapTradeReviewDialog: FC<{
           type: 'swap',
           chainId: chainId,
           txHash: hash,
-          promise: receiptPromise,
+          promise,
           summary: {
             pending: `${
               isWrap ? 'Wrapping' : isUnwrap ? 'Unwrapping' : 'Swapping'
@@ -197,7 +197,7 @@ export const SimpleSwapTradeReviewDialog: FC<{
           groupTimestamp: ts,
         })
 
-        const receipt = await receiptPromise
+        const receipt = await promise
         {
           const trade = tradeRef.current
           if (receipt.status === 'success') {
@@ -274,25 +274,9 @@ export const SimpleSwapTradeReviewDialog: FC<{
 
     return async (confirm: () => void) => {
       try {
-        Sentry.addBreadcrumb({
-          category: 'swap',
-          message: 'Swap execution in progress',
-          level: 'info',
-        })
         await sendTransactionAsync(simulation)
-        // Add breadcrumb for successful swap
-        Sentry.addBreadcrumb({
-          category: 'swap',
-          message: 'Swap completed successfully',
-          level: 'info',
-        })
         confirm()
       } catch (e) {
-        Sentry.addBreadcrumb({
-          category: 'swap',
-          message: 'Swap failed',
-          level: 'error',
-        })
         Sentry.captureException(e)
         throw e
       }
@@ -302,7 +286,6 @@ export const SimpleSwapTradeReviewDialog: FC<{
   const { status } = useWaitForTransactionReceipt({
     chainId: chainId,
     hash: data,
-    retryCount: 30,
   })
 
   return (