Refactor error handling in AtomicChat components to improve user feedback and streamline API error messages.

Author: arentant

apps/app/components/Swap/AtomicChat/Actions/UserActions.tsx

@@ -42,7 +42,7 @@ export const UserLockAction: FC<UserCommitActionProps> = ({ quote, type }) => {
 
             if (!sourceClient) throw new Error("No source client")
 
-            const result = await sourceClient.userLock({
+                const result = await sourceClient.userLock({
                 ...resolveQuote(quote),
                 sourceAddress: sourceWallet.address,
                 destinationAddress: address,
@@ -54,7 +54,6 @@ export const UserLockAction: FC<UserCommitActionProps> = ({ quote, type }) => {
                 destLpAddress,
                 srcLpAddress,
                 tokenContractAddress: source_asset.contractAddress,
-                decimals: source_asset.decimals,
                 atomicContract,
                 chainId: source_network.chainId,
                 hashlock,

apps/app/components/Swap/AtomicChat/Actions/index.tsx

@@ -208,9 +208,6 @@ const TransactionMessage: FC<{ error: string | undefined, disableButton?: boolea
             />
         )
     }
-    if (error === 'TrainApiError') {
-        return <WalletMessage status="error" header="API error" details="Something went wrong while communicating with the server. Please try again." />
-    }
     if (error) {
         return <TransactionMessages.UexpectedErrorMessage message={error} />
     }

apps/app/components/Swap/AtomicChat/AtomicContent/useSwapProgress.tsx

@@ -171,13 +171,27 @@ export function useSwapProgress(): SwapProgress {
 
     return useMemo(() => {
         const sourceTxLink = buildExplorerLink(source_network?.caip2Id, lockTxId);
-        const lpLockTx = htlcFromApi?.transactions?.find(t => t.type === HTLCTransaction.HTLCLock as string);
-        const destTxLink = buildExplorerLink(destination_network?.caip2Id, lpLockTx?.hash);
+        const solverLockTx = htlcFromApi?.transactions?.find(t => t.type === HTLCTransaction.HTLCLock as string);
+        const destTxLink = buildExplorerLink(destination_network?.caip2Id, solverLockTx?.hash);
         const redeemTxLink = buildExplorerLink(destination_network?.caip2Id, destRedeemTx);
         const refundTxLink = buildExplorerLink(source_network?.caip2Id, refundTxId);
 
         const isRefunded = sourceDetails?.status === LockStatus.Refunded;
 
+        // API error — overlay on current progress
+        if (htlcFromApi?.error?.message) {
+            const currentIndex = solverLockTx ? 2 : 1
+            return {
+                gaugeValue: 50, gaugeIcon: "x" as GaugeIcon,
+                title: "Something went wrong",
+                subtitle: htlcFromApi.error.message,
+                steps: buildSteps(HAPPY_STEPS, currentIndex, { source: sourceTxLink, dest: destTxLink }, {
+                    0: { timelock: sourceDetails?.timelock },
+                    1: { description: solverLockTx ? <VerificationStatus /> : null, status: solverLockTx ? StepStatus.Complete : StepStatus.Failed },
+                }),
+            };
+        }
+
         // Initial (no tx yet)
         if (htlcStatus === HTLCStatus.Initial && !lockTxId) {
             return { gaugeValue: 0, gaugeIcon: null, title: "Ready to swap", subtitle: null, steps: [] };

apps/app/context/atomicContext.tsx

@@ -163,7 +163,7 @@ export function AtomicProvider({ children }) {
             if (hashlock) updateHTLCState(hashlock, { htlcFromApi: order })
         },
         onFailed: () => {
-            setError({ message: 'Please wait for the timelock to expire, then refund to receive your assets back.', disableButton: true })
+            if (hashlock) updateHTLCState(hashlock, { htlcFromApi: { error: { message: 'Please wait for the timelock to expire, then refund to receive your assets back.' } } })
         },
     })
 

packages/blockchains/aztec/src/client.ts

@@ -68,7 +68,7 @@ export class AztecHTLCClient extends HTLCClient {
             await signer.wallet.registerContract(tokenInstance, TokenContract.artifact)
             const token = TokenContract.at(tokenAddress, signer.wallet)
 
-            const amount = parseUnits(params.amount.toString(), params.decimals)
+            const amount = parseUnits(params.amount.toString(), params.sourceAsset.decimals)
 
             // Authorize public token transfer
             const transferNonce = Fr.random()

packages/blockchains/evm/src/client.ts

@@ -37,7 +37,7 @@ export class EvmHTLCClient extends HTLCClient {
             sourceAddress
         } = params
 
-        const parsedAmount = parseUnits(params.amount.toString(), params.decimals)
+        const parsedAmount = parseUnits(params.amount.toString(), params.sourceAsset.decimals)
         const tokenAddress = sourceAsset.contractAddress || ZERO_ADDRESS
         const isNativeToken = !sourceAsset.contractAddress || sourceAsset.contractAddress === ZERO_ADDRESS
 

packages/blockchains/fuel/src/client.ts

@@ -50,7 +50,7 @@ export class FuelHTLCClient extends HTLCClient {
             sourceChain,
         } = params
 
-        const parsedAmount = parseUnits(params.amount.toString(), params.decimals)
+        const parsedAmount = parseUnits(params.amount.toString(), params.sourceAsset.decimals)
         const isNativeToken = !sourceAsset.contractAddress
 
         try {

packages/blockchains/solana/src/transactionBuilder.ts

@@ -35,19 +35,21 @@ export const userLockTransactionBuilder = async (params: UserLockParams): Promis
 
     if (!walletPublicKey) throw new Error("Wallet not connected")
     if (!params.srcLpAddress) throw new Error("No LP address")
+    if (!params.nonce) throw new Error("No nonce")
+    if (!params.solverData) throw new Error("No solver data")
 
     const hashlock = Buffer.from(params.hashlock.replace('0x', ''), 'hex')
-    const bnAmount = toBaseUnits(params.amount, params.decimals)
+    const bnAmount = toBaseUnits(params.amount, params.sourceAsset.decimals)
     const bnDstAmount = new BN(params.destinationAmount)
     const bnRewardAmount = new BN(params.rewardAmount || '0')
     const bnTimelockDelta = new BN(params.timelockDelta || 0)
     const bnRewardTimelockDelta = new BN(params.rewardTimelockDelta || 0)
     const bnQuoteExpiry = new BN(params.quoteExpiry)
     const lpPublicKey = new PublicKey(params.srcLpAddress)
     const hashlockArray = Array.from(hashlock)
-    const userData = params.nonce != null ? Buffer.from(params.nonce.toString(), 'utf8') : Buffer.from([])
-    const solverDataBytes = params.solverData ? Buffer.from(params.solverData, 'utf8') : Buffer.from([])
-
+    const userData = Buffer.from(params.nonce.toString(), 'utf8')
+    const solverDataBytes = Buffer.from(params.solverData, 'utf8')
+    
     const [userLockPda] = PublicKey.findProgramAddressSync(
         [Buffer.from("user_lock"), hashlock],
         program.programId

packages/blockchains/starknet/src/client.ts

@@ -32,7 +32,7 @@ export class StarknetHTLCClient extends HTLCClient {
     async userLock(params: UserLockParams): Promise<AtomicResult> {
         const signer = this.requireSigner()
 
-        const parsedAmount = parseUnits(params.amount.toString(), params.decimals)
+        const parsedAmount = parseUnits(params.amount.toString(), params.sourceAsset.decimals)
         const tokenAddress = params.tokenContractAddress || params.sourceAsset.contractAddress || ZERO_ADDRESS
 
         // ERC20 approval

packages/blockchains/ton/src/client.ts

@@ -48,7 +48,7 @@ export class TonHTLCClient extends HTLCClient {
     async userLock(params: UserLockParams): Promise<AtomicResult> {
         const signer = this.requireSigner()
 
-        const parsedAmount = parseUnits(params.amount.toString(), params.decimals)
+        const parsedAmount = parseUnits(params.amount.toString(), params.sourceAsset.decimals)
         const isNativeToken = !params.sourceAsset.contractAddress
 
         try {