@rango-dev/widget-embedded 0.45.1-next.9 → 0.46.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.45.1-next.9",
+  "version": "0.46.0",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -24,16 +24,16 @@
   "dependencies": {
     "@lingui/core": "4.2.1",
     "@lingui/react": "4.2.1",
-    "@rango-dev/logging-core": "^0.9.1-next.0",
-    "@rango-dev/provider-all": "^0.48.1-next.4",
-    "@rango-dev/queue-manager-core": "^0.30.1-next.0",
-    "@rango-dev/queue-manager-rango-preset": "^0.47.1-next.4",
-    "@rango-dev/queue-manager-react": "^0.30.1-next.0",
-    "@rango-dev/signer-solana": "^0.41.1-next.0",
-    "@rango-dev/ui": "^0.48.1-next.6",
-    "@rango-dev/wallets-core": "^0.45.1-next.3",
-    "@rango-dev/wallets-react": "^0.32.1-next.3",
-    "@rango-dev/wallets-shared": "^0.46.1-next.3",
+    "@rango-dev/logging-core": "^0.10.0",
+    "@rango-dev/provider-all": "^0.49.0",
+    "@rango-dev/queue-manager-core": "^0.31.0",
+    "@rango-dev/queue-manager-rango-preset": "^0.48.0",
+    "@rango-dev/queue-manager-react": "^0.31.0",
+    "@rango-dev/signer-solana": "^0.42.0",
+    "@rango-dev/ui": "^0.49.0",
+    "@rango-dev/wallets-core": "^0.46.0",
+    "@rango-dev/wallets-react": "^0.33.0",
+    "@rango-dev/wallets-shared": "^0.47.0",
     "bignumber.js": "^9.1.1",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.7",

package/src/components/Quote/Quote.tsx

@@ -134,11 +134,11 @@ export function Quote(props: QuoteProps) {
 
       const hasSlippageError =
         error?.type === QuoteErrorType.INSUFFICIENT_SLIPPAGE &&
-        error.recommendedSlippages?.has(index);
+        !!error.recommendedSlippages?.[index];
 
       const hasSlippageWarning =
         warning?.type === QuoteWarningType.INSUFFICIENT_SLIPPAGE &&
-        warning.recommendedSlippages?.has(index);
+        !!warning.recommendedSlippages?.[index];
 
       const stepHasError = hasBridgeLimitError || hasSlippageError;
       const stepHasWarning = hasSlippageWarning;
@@ -269,12 +269,12 @@ export function Quote(props: QuoteProps) {
                                 ...(error?.type ===
                                   QuoteErrorType.INSUFFICIENT_SLIPPAGE && {
                                   minRequiredSlippage:
-                                    error.recommendedSlippages?.get(index),
+                                    error.recommendedSlippages?.[index],
                                 }),
                                 ...(warning?.type ===
                                   QuoteWarningType.INSUFFICIENT_SLIPPAGE && {
                                   minRequiredSlippage:
-                                    warning.recommendedSlippages?.get(index),
+                                    warning.recommendedSlippages?.[index],
                                 }),
                               },
                             })}

package/src/hooks/useConfirmSwap/useConfirmSwap.helpers.ts

@@ -124,42 +124,29 @@ export function generateWarnings(params: {
   return output;
 }
 
-export function handleQuoteErrors(error: any): ConfirmSwapFetchResult {
+export function handleQuoteErrors(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  error: any
+): NonNullable<ConfirmSwapFetchResult['error']> {
   if (error?.code === 'ERR_CANCELED') {
     return {
-      swap: null,
-      error: {
-        type: QuoteErrorType.REQUEST_CANCELED,
-      },
-      warnings: null,
+      type: QuoteErrorType.REQUEST_CANCELED,
     };
   }
 
   if (error.cause) {
-    return {
-      swap: null,
-      error: error.cause,
-      warnings: null,
-    };
+    return error.cause;
   }
 
   if (error?.code === 'ERR_BAD_REQUEST') {
     return {
-      swap: null,
-      error: {
-        type: QuoteErrorType.NO_RESULT,
-        diagnosisMessage: error.response.data.error,
-      },
-      warnings: null,
+      type: QuoteErrorType.NO_RESULT,
+      diagnosisMessage: error.response.data.error,
     };
   }
 
   return {
-    swap: null,
-    error: {
-      type: QuoteErrorType.REQUEST_FAILED,
-      diagnosisMessage: error.message,
-    },
-    warnings: null,
+    type: QuoteErrorType.REQUEST_FAILED,
+    diagnosisMessage: error.message,
   };
 }

package/src/hooks/useConfirmSwap/useConfirmSwap.ts

@@ -1,12 +1,17 @@
 import type { ConfirmSwap } from './useConfirmSwap.types';
-import type { PendingSwapSettings, SelectedQuote } from '../../types';
 import type { ConfirmRouteRequest } from 'rango-sdk';
 
+import { warn } from '@rango-dev/logging-core';
 import { calculatePendingSwap } from '@rango-dev/queue-manager-rango-preset';
 import { useEffect } from 'react';
 
 import { useAppStore } from '../../store/AppStore';
 import { useQuoteStore } from '../../store/quote';
+import {
+  type PendingSwapSettings,
+  QuoteErrorType,
+  type SelectedQuote,
+} from '../../types';
 import { getWalletsForNewSwap } from '../../utils/swap';
 import { useFetchConfirmQuote } from '../useFetchConfirmQuote';
 
@@ -125,9 +130,19 @@ export function useConfirmSwap(): ConfirmSwap {
           warnings: confirmSwapWarnings,
         };
       });
-    } catch (error: any) {
-      const confirmSwapResult = handleQuoteErrors(error);
-      return confirmSwapResult;
+    } catch (error: unknown) {
+      const quoteError = handleQuoteErrors(error);
+      if (quoteError.type !== QuoteErrorType.REQUEST_CANCELED) {
+        warn(new Error('confirm swap error'), {
+          tags: {
+            ...quoteError,
+            type: QuoteErrorType[quoteError.type],
+            initialQuote,
+            requestBody,
+          },
+        });
+      }
+      return { swap: null, error: quoteError, warnings: null };
     }
   };
 

package/src/hooks/useSwapInput.ts

@@ -1,5 +1,6 @@
 import type { Token } from 'rango-sdk';
 
+import { warn } from '@rango-dev/logging-core';
 import { useCallback, useEffect, useRef, useState } from 'react';
 
 import { useAppStore } from '../store/AppStore';
@@ -168,16 +169,24 @@ export function useSwapInput({
           updateQuotePartialState('warning', quoteWarning);
         })
         .catch((error) => {
-          const { error: quoteError } = handleQuoteErrors(error);
+          const quoteError = handleQuoteErrors(error);
           if (
-            quoteError?.type === QuoteErrorType.NO_RESULT ||
-            quoteError?.type === QuoteErrorType.REQUEST_FAILED
+            quoteError.type === QuoteErrorType.NO_RESULT ||
+            quoteError.type === QuoteErrorType.REQUEST_FAILED
           ) {
             resetQuote();
           }
-          if (quoteError?.type !== QuoteErrorType.REQUEST_CANCELED) {
+
+          if (quoteError.type !== QuoteErrorType.REQUEST_CANCELED) {
             updateQuotePartialState('error', quoteError);
             setLoading(false);
+            warn(new Error('quote error'), {
+              tags: {
+                ...quoteError,
+                type: QuoteErrorType[quoteError.type],
+                requestBody,
+              },
+            });
           }
         });
     }

package/src/types/quote.ts

@@ -57,7 +57,7 @@ export enum QuoteWarningType {
   EXCESSIVE_OUTPUT_AMOUNT_CHANGE,
 }
 
-export type RecommendedSlippages = Map<number, string>;
+export type RecommendedSlippages = Record<number, string>;
 
 export type InsufficientSlippageWarning = {
   type: QuoteWarningType.INSUFFICIENT_SLIPPAGE;

package/src/utils/swap.ts

@@ -353,14 +353,14 @@ export function hasSlippageError(
 export function checkSlippageErrors(
   swaps: SwapResult[]
 ): RecommendedSlippages | null {
-  const recommendedSlippages: RecommendedSlippages = new Map();
+  const recommendedSlippages = new Map<number, string>();
   swaps.forEach((swap, index) => {
     if (swap.recommendedSlippage?.error) {
       recommendedSlippages.set(index, swap.recommendedSlippage.slippage);
     }
   });
   if (recommendedSlippages.size > 0) {
-    return recommendedSlippages;
+    return Object.fromEntries(recommendedSlippages);
   }
   return null;
 }
@@ -369,7 +369,7 @@ export function checkSlippageWarnings(
   quote: SelectedQuote,
   userSlippage: number
 ): RecommendedSlippages | null {
-  const recommendedSlippages: RecommendedSlippages = new Map();
+  const recommendedSlippages = new Map<number, string>();
   quote?.swaps.forEach((swap, index) => {
     if (
       swap.recommendedSlippage?.slippage &&
@@ -379,7 +379,7 @@ export function checkSlippageWarnings(
     }
   });
   if (recommendedSlippages.size > 0) {
-    return recommendedSlippages;
+    return Object.fromEntries(recommendedSlippages);
   }
   return null;
 }