@aurora-is-near/intents-swap-widget 3.17.1 → 3.17.3

package/src/hooks/useMakeNEARFtTransferCall.ts

@@ -5,6 +5,8 @@ import { getNearNep141StorageBalance } from '../utils/near/getNearNep141StorageB
 import { getNearNep141MinStorageBalance } from '../utils/near/getNearNep141MinStorageBalance';
 import { logger } from '@/logger';
 import { TransferError } from '@/errors';
+import { isErrorLikeObject } from '@/utils/isErrorLikeObject';
+import { isUserDeniedSigning } from '@/utils/checkers/isUserDeniedSigning';
 import { useComputedSnapshot, useUnsafeSnapshot } from '@/machine/snap';
 import { NATIVE_NEAR_DUMB_ASSET_ID, WNEAR_ASSET_ID } from '@/constants/tokens';
 import type { TransferResult } from '@/types/transfer';
@@ -139,6 +141,10 @@ export function useMakeNEARFtTransferCall(
           code: 'NO_DEPOSIT_RESULT',
         });
       } catch (err: unknown) {
+        if (isErrorLikeObject(err) && isUserDeniedSigning(err)) {
+          return;
+        }
+
         logger.error('[TRANSFER ERROR]', err);
         throw new TransferError({
           code: 'DIRECT_TRANSFER_ERROR',
@@ -214,6 +220,10 @@ export function useMakeNEARFtTransferCall(
         code: 'NO_DEPOSIT_RESULT',
       });
     } catch (err: unknown) {
+      if (isErrorLikeObject(err) && isUserDeniedSigning(err)) {
+        return;
+      }
+
       logger.error('[TRANSFER ERROR]', err);
       throw new TransferError({
         code: 'DIRECT_TRANSFER_ERROR',

package/src/hooks/useMakeQuoteTransfer.ts

@@ -12,6 +12,7 @@ import { logger } from '@/logger';
 import { TransferError } from '@/errors';
 import { useUnsafeSnapshot } from '@/machine/snap';
 import { NATIVE_NEAR_DUMB_ASSET_ID } from '@/constants/tokens';
+import { isErrorLikeObject } from '@/utils/isErrorLikeObject';
 import { isUserDeniedSigning } from '@/utils/checkers/isUserDeniedSigning';
 import type { MakeTransferArgs, TransferResult } from '@/types/transfer';
 
@@ -139,7 +140,7 @@ export const useMakeQuoteTransfer = ({
       let errorMessage = 'Failed to make a transfer. Please try again.';
 
       const userCancelledTx =
-        error instanceof Error && isUserDeniedSigning(error.message);
+        isErrorLikeObject(error) && isUserDeniedSigning(error);
 
       if (userCancelledTx) {
         return;

package/src/utils/checkers/isUserDeniedSigning.ts

@@ -1,3 +1,5 @@
+import type { ErrorLikeObject } from '../isErrorLikeObject';
+
 const errorVariations = [
   'user denied',
   'user closed',
@@ -6,8 +8,14 @@ const errorVariations = [
   'user declined',
 ];
 
-export const isUserDeniedSigning = (errorMessage: string) => {
-  return errorVariations.some((variation) =>
-    errorMessage.toLowerCase().includes(variation),
+export const isUserDeniedSigning = (error: ErrorLikeObject) => {
+  return (
+    errorVariations.some((variation) =>
+      error.message.toLowerCase().includes(variation),
+    ) ||
+    ('cause' in error &&
+      errorVariations.some((variation) =>
+        `${error.cause}`.toLowerCase().includes(variation),
+      ))
   );
 };

package/src/utils/index.ts

@@ -21,3 +21,4 @@ export { formatAddressTruncate } from './formatters/formatAddressTruncate';
 export { cn } from './cn';
 export { noop } from './noop';
 export { notReachable } from './notReachable';
+export { isErrorLikeObject } from './isErrorLikeObject';

package/src/utils/intents/signers/near.ts

@@ -1,4 +1,4 @@
-import { createIntentSignerNEP413 } from '@defuse-protocol/bridge-sdk';
+import { createIntentSignerNEP413 } from '@defuse-protocol/intents-sdk';
 import type {
   NearWalletBase as NearWallet,
   SignedMessage,

package/src/utils/intents/signers/privy.ts

@@ -1,5 +1,5 @@
 import { utils } from '@defuse-protocol/internal-utils';
-import { createIntentSignerViem } from '@defuse-protocol/bridge-sdk';
+import { createIntentSignerViem } from '@defuse-protocol/intents-sdk';
 
 import { EvmProvider } from '@/types';
 import { WidgetError } from '@/errors';

package/src/utils/intents/signers/solana.ts

@@ -1,5 +1,5 @@
 import { utils } from '@defuse-protocol/internal-utils';
-import { createIntentSignerViem } from '@defuse-protocol/bridge-sdk';
+import { createIntentSignerViem } from '@defuse-protocol/intents-sdk';
 import bs58 from 'bs58';
 import { SolanaProvider } from '../../../types/providers';
 

package/src/utils/isErrorLikeObject.ts

@@ -0,0 +1,11 @@
+export type ErrorLikeObject = Error | { message: string };
+
+export const isErrorLikeObject = (error: unknown): error is ErrorLikeObject => {
+  return (
+    error instanceof Error ||
+    (typeof error === 'object' &&
+      error !== null &&
+      'message' in error &&
+      typeof error.message === 'string')
+  );
+};