@ensofinance/checkout-widget 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ensofinance/checkout-widget",
-    "version": "0.1.5",
+    "version": "0.1.7",
     "type": "module",
     "homepage": "https://www.enso.build/",
     "repository": {

package/src/components/steps/ExchangeFlow.tsx

@@ -159,18 +159,18 @@ export enum WithdrawalStep {
     InitiateWithdrawal,
     TrackUserOp,
 }
-const withdrawalSteps = [
-    WithdrawalStep.ChooseExchange,
-    WithdrawalStep.ChooseExchangeAsset,
-    WithdrawalStep.ChooseAmount,
-    WithdrawalStep.SignUserOp,
-    WithdrawalStep.InitiateWithdrawal,
-];
-const balanceSteps = [
-    WithdrawalStep.ChooseBalanceAsset,
-    WithdrawalStep.ChooseAmount,
-    WithdrawalStep.SignUserOp,
-];
+const withdrawalPreviousStep: Partial<Record<WithdrawalStep, WithdrawalStep>> =
+    {
+        [WithdrawalStep.CheckSessionKey]: WithdrawalStep.ChooseExchange,
+        [WithdrawalStep.ChooseExchangeAsset]: WithdrawalStep.ChooseExchange,
+        [WithdrawalStep.ChooseAmount]: WithdrawalStep.ChooseExchangeAsset,
+        [WithdrawalStep.SignUserOp]: WithdrawalStep.ChooseAmount,
+        [WithdrawalStep.InitiateWithdrawal]: WithdrawalStep.SignUserOp,
+    };
+const balancePreviousStep: Partial<Record<WithdrawalStep, WithdrawalStep>> = {
+    [WithdrawalStep.ChooseAmount]: WithdrawalStep.ChooseBalanceAsset,
+    [WithdrawalStep.SignUserOp]: WithdrawalStep.ChooseAmount,
+};
 // Integration details are fetched dynamically from Mesh API.
 
 // Mesh network IDs for EVM chains (from Mesh networks API)
@@ -901,7 +901,9 @@ const ChooseAmountStep = ({
         }
 
         try {
-            setAmountIn(denormalizeValue(normalizedAmount, tokenInData.decimals));
+            setAmountIn(
+                denormalizeValue(normalizedAmount, tokenInData.decimals),
+            );
         } catch (error) {
             setAmountIn("0");
         }
@@ -918,7 +920,7 @@ const ChooseAmountStep = ({
 
     // Limits validation logic - only for CEX withdrawals
     const currentUsdValue = hasUsdValue
-        ? getPositiveDecimalValue(usdValue) ?? 0
+        ? (getPositiveDecimalValue(usdValue) ?? 0)
         : 0;
     const minValueForToken =
         isWithdrawal && selectedToken
@@ -992,9 +994,7 @@ const ChooseAmountStep = ({
                     fontSize="xs"
                     h={3}
                     m={-1}
-                    visibility={
-                        isAmountInvalid ? "visible" : "hidden"
-                    }
+                    visibility={isAmountInvalid ? "visible" : "hidden"}
                 >
                     {!hasPositiveAmount
                         ? "Please enter an amount"
@@ -1270,7 +1270,14 @@ const InitiateWithdrawalStep = ({
     if (error) {
         return (
             <BodyWrapper>
-                <Flex direction="column" align="center" justify="center" flex={1} p={6} gap={4}>
+                <Flex
+                    direction="column"
+                    align="center"
+                    justify="center"
+                    flex={1}
+                    p={6}
+                    gap={4}
+                >
                     <Flex
                         align="center"
                         justify="center"
@@ -1279,7 +1286,11 @@ const InitiateWithdrawalStep = ({
                         borderRadius="full"
                         bg="orange.100"
                     >
-                        <Icon as={TriangleAlert} boxSize={6} color="orange.500" />
+                        <Icon
+                            as={TriangleAlert}
+                            boxSize={6}
+                            color="orange.500"
+                        />
                     </Flex>
                     <Text fontSize="md" textAlign="center" color="gray.700">
                         {error}
@@ -2035,15 +2046,15 @@ const ExchangeFlow = ({
                             minHeight={"16px"}
                             maxWidth={"16px"}
                             onClick={() => {
-                                const index =
-                                    (selectedIntegration?.type === "delayed"
-                                        ? balanceSteps
-                                        : withdrawalSteps
-                                    ).findIndex(
-                                        (step) => step === currentStep,
-                                    ) - 1;
-                                if (index >= 0) {
-                                    setCurrentStep(withdrawalSteps[index]);
+                                const previousStep = (
+                                    isDelayedBalanceUsed(
+                                        selectedIntegration?.type,
+                                    )
+                                        ? balancePreviousStep
+                                        : withdrawalPreviousStep
+                                )[currentStep];
+                                if (previousStep !== undefined) {
+                                    setCurrentStep(previousStep);
                                 } else {
                                     setFlow("");
                                 }

package/src/components/steps/WalletFlow/WalletTokenStep.tsx

@@ -15,8 +15,16 @@ const WalletAssetStep = ({ setStep }: { setStep: (step: string) => void }) => {
     const tokenIn = useAppStore((state) => state.tokenIn);
     const setChainIdIn = useAppStore((state) => state.setChainIdIn);
     const chainIdIn = useAppStore((state) => state.chainIdIn);
+    const tokenOut = useAppStore((state) => state.tokenOut);
+    const chainIdOut = useAppStore((state) => state.chainIdOut);
     const { holdingsList, isLoading } = useWalletBalance();
 
+    const filteredHoldings = holdingsList?.filter(
+        (asset) =>
+            !(asset.token.toLowerCase() === tokenOut.toLowerCase() &&
+              asset.chainId === chainIdOut),
+    );
+
     useEffect(() => {
         setSelectedIntegration(null);
     }, []);
@@ -33,7 +41,7 @@ const WalletAssetStep = ({ setStep }: { setStep: (step: string) => void }) => {
                                   width="300px"
                               />
                           ))
-                        : holdingsList?.map((asset) => (
+                        : filteredHoldings?.map((asset) => (
                               <AssetCard
                                   key={`${asset.token}-${asset.chainId}`}
                                   chainId={asset.chainId}

package/src/enso-api/model/bridgeTransactionResponse.ts

@@ -1,37 +0,0 @@
-/**
- * Generated by orval v7.11.1 🍺
- * Do not edit manually.
- * #### Enso API
-- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
-- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
-- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
-- Get your own API Key at [enso.finance/developers](https://developers.enso.build/).
- * OpenAPI spec version: 1.0
- */
-import type { BridgeTransactionResponseStatus } from "./bridgeTransactionResponseStatus";
-import type { LayerZeroMessageStatus } from "./layerZeroMessageStatus";
-import type { EnsoEvent } from "./ensoEvent";
-import type { EnsoMetadata } from "./ensoMetadata";
-
-export interface BridgeTransactionResponse {
-    /** Source chain ID */
-    sourceChainId: number;
-    /** Source transaction hash */
-    sourceTxHash: string;
-    /** Destination chain ID (if known) */
-    destinationChainId?: number;
-    /** Destination transaction hash (if completed) */
-    destinationTxHash?: string;
-    /** Overall bridge status */
-    status: BridgeTransactionResponseStatus;
-    /** LayerZero message information */
-    layerZeroMessage?: LayerZeroMessageStatus;
-    /** Enso shortcut event from source chain (ShortcutExecuted + execution result) */
-    ensoSourceEvent?: EnsoEvent;
-    /** Enso shortcut event from destination chain (ShortcutExecuted + execution result) */
-    ensoDestinationEvent?: EnsoEvent;
-    /** Enso transaction metadata */
-    ensoMetadata?: EnsoMetadata;
-    /** Error message if something went wrong */
-    error?: string;
-}

package/src/enso-api/model/bridgeTransactionResponseStatus.ts

@@ -1,25 +0,0 @@
-/**
- * Generated by orval v7.11.1 🍺
- * Do not edit manually.
- * #### Enso API
-- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
-- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
-- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
-- Get your own API Key at [enso.finance/developers](https://developers.enso.build/).
- * OpenAPI spec version: 1.0
- */
-
-/**
- * Overall bridge status
- */
-export type BridgeTransactionResponseStatus =
-    (typeof BridgeTransactionResponseStatus)[keyof typeof BridgeTransactionResponseStatus];
-
-// eslint-disable-next-line @typescript-eslint/no-redeclare
-export const BridgeTransactionResponseStatus = {
-    pending: "pending",
-    inflight: "inflight",
-    delivered: "delivered",
-    failed: "failed",
-    unknown: "unknown",
-} as const;

package/src/enso-api/model/ensoEvent.ts

@@ -1,30 +0,0 @@
-/**
- * Generated by orval v7.11.1 🍺
- * Do not edit manually.
- * #### Enso API
-- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
-- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
-- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
-- Get your own API Key at [enso.finance/developers](https://developers.enso.build/).
- * OpenAPI spec version: 1.0
- */
-import type { RefundDetails } from "./refundDetails";
-
-export interface EnsoEvent {
-    /** Account ID from ShortcutExecuted event */
-    accountId?: string;
-    /** Request ID from ShortcutExecuted event */
-    requestId?: string;
-    /** Block number where the event was emitted */
-    blockNumber: number;
-    /** Transaction hash */
-    transactionHash: string;
-    /** Chain ID where the event was emitted */
-    chainId: number;
-    /** Whether the shortcut execution was successful */
-    success: boolean;
-    /** Error data if execution failed */
-    error?: string;
-    /** Refund details if execution failed and funds were returned */
-    refundDetails?: RefundDetails;
-}

package/src/enso-api/model/ensoMetadata.ts

@@ -1,23 +0,0 @@
-/**
- * Generated by orval v7.11.1 🍺
- * Do not edit manually.
- * #### Enso API
-- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
-- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
-- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
-- Get your own API Key at [enso.finance/developers](https://developers.enso.build/).
- * OpenAPI spec version: 1.0
- */
-
-export interface EnsoMetadata {
-    /** Token in address */
-    tokenIn?: string;
-    /** Token out address */
-    tokenOut?: string;
-    /** Amount in */
-    amountIn?: string;
-    /** Chain ID from the request */
-    chainId?: number;
-    /** Timestamp of the request */
-    timestamp?: number;
-}

package/src/enso-api/model/layerZeroControllerCheckBridgeTransactionParams.ts

@@ -1,21 +0,0 @@
-/**
- * Generated by orval v7.11.1 🍺
- * Do not edit manually.
- * #### Enso API
-- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
-- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
-- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
-- Get your own API Key at [enso.finance/developers](https://developers.enso.build/).
- * OpenAPI spec version: 1.0
- */
-
-export type LayerZeroControllerCheckBridgeTransactionParams = {
-    /**
-     * Chain ID of the source transaction
-     */
-    chainId: number;
-    /**
-     * Transaction hash
-     */
-    txHash: string;
-};

package/src/enso-api/model/layerZeroMessageStatus.ts

@@ -1,39 +0,0 @@
-/**
- * Generated by orval v7.11.1 🍺
- * Do not edit manually.
- * #### Enso API
-- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
-- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
-- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
-- Get your own API Key at [enso.finance/developers](https://developers.enso.build/).
- * OpenAPI spec version: 1.0
- */
-
-export interface LayerZeroMessageStatus {
-    /** Source chain endpoint ID */
-    srcEid: number;
-    /** Destination chain endpoint ID */
-    dstEid: number;
-    /** Source chain ID (EVM) */
-    srcChainId?: number;
-    /** Destination chain ID (EVM) */
-    dstChainId?: number;
-    /** Message status from LayerZero */
-    status: string;
-    /** Source transaction hash */
-    srcTxHash?: string;
-    /** Destination transaction hash (if delivered) */
-    dstTxHash?: string;
-    /** Source block number */
-    srcBlockNumber?: number;
-    /** Destination block number (if delivered) */
-    dstBlockNumber?: number;
-    /** Source timestamp */
-    srcTimestamp?: string;
-    /** Destination timestamp (if delivered) */
-    dstTimestamp?: string;
-    /** Sender address */
-    sender?: string;
-    /** Receiver address */
-    receiver?: string;
-}

package/src/enso-api/model/refundDetails.ts

@@ -1,21 +0,0 @@
-/**
- * Generated by orval v7.11.1 🍺
- * Do not edit manually.
- * #### Enso API
-- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
-- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
-- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
-- Get your own API Key at [enso.finance/developers](https://developers.enso.build/).
- * OpenAPI spec version: 1.0
- */
-
-export interface RefundDetails {
-    /** Token address (0xeee... for native token) */
-    token: string;
-    /** Amount refunded */
-    amount: string;
-    /** Recipient address */
-    recipient: string;
-    /** Whether the refund is in native token */
-    isNative: boolean;
-}