Fuel disconnect fix, query balance provider fix, different account tr…

…ansfer error handling

components/Swap/Withdraw/Wallet/WalletTransfer/TransferToken.tsx

@@ -3,7 +3,7 @@ import {
     useAccount,
     useSendTransaction
 } from "wagmi";
-import { createPublicClient, http, parseEther } from 'viem'
+import { parseEther } from 'viem'
 import SubmitButton from "../../../../buttons/submitButton";
 import { BackendTransactionStatus } from "../../../../../lib/layerSwapApiClient";
 import WalletIcon from "../../../../icons/WalletIcon";
@@ -29,19 +29,14 @@ const TransferTokenButton: FC<BaseTransferButtonProps> = ({
 
     const { selectedSourceAccount } = useSwapDataState()
 
-    const { chain } = useAccount();
+    const { address } = useAccount();
     const { setSwapTransaction } = useSwapTransactionStore();
     const { depositActionsResponse } = useSwapDataState()
 
     const callData = depositActionsResponse?.find(da => true)?.call_data as `0x${string}` | undefined
 
     const transaction = useSendTransaction()
 
-    const publicClient = createPublicClient({
-        chain: chain,
-        transport: http()
-    })
-
     useEffect(() => {
         (async () => {
             if (selectedSourceAccount?.address && depositAddress) {
@@ -111,6 +106,8 @@ const TransferTokenButton: FC<BaseTransferButtonProps> = ({
             <TransactionMessage
                 transaction={transaction}
                 applyingTransaction={applyingTransaction}
+                activeAddress={address}
+                selectedSourceAddress={selectedSourceAccount?.address}
             />
         }
         {

components/Swap/Withdraw/Wallet/WalletTransfer/index.tsx

@@ -1,6 +1,5 @@
 import { FC, useEffect, useState } from "react";
 import { useAccount } from "wagmi";
-import { useSwitchChain } from 'wagmi'
 import { PublishedSwapTransactions } from "../../../../../lib/layerSwapApiClient";
 import { ChangeNetworkButton, ConnectWalletButton } from "./buttons";
 import TransferTokenButton from "./TransferToken";

components/Swap/Withdraw/Wallet/WalletTransfer/transactionMessage.tsx

@@ -4,19 +4,22 @@ import resolveError from "./resolveError"
 import { ActionData } from "./sharedTypes"
 import { BaseError } from 'viem'
 import { datadogRum } from '@datadog/browser-rum';
+import { addressFormat } from "../../../../../lib/address/formatter"
 
 type TransactionMessageProps = {
     wait?: ActionData,
     transaction: ActionData,
-    applyingTransaction: boolean
+    applyingTransaction: boolean,
+    activeAddress: string | undefined
+    selectedSourceAddress: string | undefined
 }
 
 const TransactionMessage: FC<TransactionMessageProps> = ({
-    wait, transaction, applyingTransaction
+    wait, transaction, applyingTransaction, activeAddress, selectedSourceAddress
 }) => {
     const transactionResolvedError = resolveError(transaction?.error as BaseError)
     const hasError = transaction?.isError || wait?.isError
-    
+
     if (wait?.isPending || applyingTransaction) {
         return <TransactionInProgressMessage />
     }
@@ -28,7 +31,11 @@ const TransactionMessage: FC<TransactionMessageProps> = ({
     }
     else if (transaction?.isError && transactionResolvedError === "transaction_rejected") {
         return <TransactionRejectedMessage />
-    } else if (hasError) {
+    }
+    else if (transaction.isError && activeAddress && selectedSourceAddress && (activeAddress?.toLowerCase() !== selectedSourceAddress?.toLowerCase())) {
+        return <UnknowndMessage />
+    }
+    else if (hasError) {
         const unexpectedError = transaction?.error?.['data']?.message || transaction?.error
             || wait?.error
 
@@ -77,6 +84,13 @@ const TransactionRejectedMessage: FC = () => {
         details={`You've rejected the transaction in your wallet. Click “Try again” to open the prompt again.`} />
 }
 
+const UnknowndMessage: FC = () => {
+    return <WalletMessage
+        status="error"
+        header='Unknown Message'
+        details={`Lorem ipsum`} />
+}
+
 const UexpectedErrorMessage: FC<{ message: string }> = ({ message }) => {
     return <WalletMessage
         status="error"

components/Wallet/WalletsList.tsx

@@ -94,7 +94,6 @@ export const WalletItem: FC<HTMLAttributes<HTMLDivElement> & WalletItemProps> =
 
     const isSelected = selectable && (wallet.addresses.length == 1 && wallet.address == selectedAddress)
     const walletBalanceAmount = walletBalance?.amount && truncateDecimals(walletBalance?.amount, token?.precision)
-    console.log(wallet)
     return (
         <div {...props} className="rounded-md outline-none text-primary-tex">
             <div

lib/newbalances/balanceResolver.ts

@@ -1,4 +1,3 @@
-import { Token } from "@imtbl/imx-sdk";
 import { NetworkWithTokens } from "../../Models/Network";
 import { EVMBalanceProvider } from "./providers/evmBalanceProvider";
 import { FuelBalanceProvider } from "./providers/fuelBalanceProvider";
@@ -12,19 +11,18 @@ import { ZkSyncBalanceProvider } from "./providers/zkSyncBalanceProvider";
 
 export class BalanceResolver {
     private providers = [
+        new QueryBalanceProvider(),
         new StarknetBalanceProvider(),
         new EVMBalanceProvider(),
         new FuelBalanceProvider(),
         new ImmutableXBalanceProvider(),
         new LoopringBalanceProvider(),
-        new QueryBalanceProvider(),
         new SolanaBalanceProvider(),
         new TonBalanceProvider(),
         new ZkSyncBalanceProvider()
     ];
 
     getBalance(address: string, network: NetworkWithTokens) {
-
         const provider = this.providers.find(p => p.supportsNetwork(network));
         //TODO: create interface for balance providers in case of empty state they shoudl throw error 
         //never return undefined as SWR does not set loading state if undefined is returned

lib/newbalances/providers/queryBalanceProvider.ts

@@ -23,8 +23,8 @@ export class QueryBalanceProvider {
                 fromAsset: null,
             };
         }
-    
-        const urlParams = new URLSearchParams(location.search); 
+
+        const urlParams = new URLSearchParams(location.search);
         return {
             from: urlParams.get('from'),
             to: urlParams.get('to'),
@@ -34,6 +34,7 @@ export class QueryBalanceProvider {
     }
 
     supportsNetwork(network: NetworkWithTokens): boolean {
+        if (!this.query.balances) return false
         return network?.name?.toLocaleLowerCase() === this.query.from?.toLowerCase() || network?.name?.toLocaleLowerCase() === this.query.to?.toLowerCase()
     }
 

lib/wallets/fuel/useFuel.ts

@@ -100,10 +100,11 @@ export default function useFuel(): WalletProvider {
             if (!fuelConnector) throw new Error('Connector not found')
 
             await fuelConnector.disconnect()
-            removeWallet(name, connectorName)
         }
         catch (e) {
             console.log(e)
+        } finally {
+            removeWallet(name, connectorName)
         }
     }