@xswap-link/sdk 0.10.7 → 0.10.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xswap-link/sdk",
-  "version": "0.10.7",
+  "version": "0.10.8",
   "description": "JavaScript SDK for XSwap platform",
   "homepage": "https://github.com/xswap-link/xswap-sdk",
   "repository": {

package/src/components/TxDataCard/TxDataCardUI/index.tsx

@@ -32,22 +32,16 @@ export const TxDataCardUI = ({
 
   const date = getDate(transaction.timestamp);
 
-  const transferredAmount =
-    transaction.sourceChainId === "mainnet-beta"
-      ? transaction.amountWei
-      : weiToHumanReadable({
-          amount: transaction.amountWei,
-          decimals: srcToken?.decimals || 18,
-          precisionFractionalPlaces: 4,
-        });
-  const receivedAmount =
-    transaction.sourceChainId === "mainnet-beta"
-      ? (transaction.tokenOutAmount as string)
-      : weiToHumanReadable({
-          amount: transaction?.tokenOutAmount || "0",
-          decimals: dstToken?.decimals || 18,
-          precisionFractionalPlaces: 4,
-        });
+  const transferredAmount = weiToHumanReadable({
+    amount: transaction.amountWei,
+    decimals: srcToken?.decimals || 18,
+    precisionFractionalPlaces: 4,
+  });
+  const receivedAmount = weiToHumanReadable({
+    amount: transaction?.tokenOutAmount || "0",
+    decimals: dstToken?.decimals || 18,
+    precisionFractionalPlaces: 4,
+  });
 
   const srcChain = supportedChains.find(
     (chain) => chain.chainId === transaction.sourceChainId,
@@ -84,11 +78,11 @@ export const TxDataCardUI = ({
             </div>
           ) : transaction.status === "DONE" ? (
             <div className="flex items-center grow justify-end text-xs">
-              <div className=" mr-1 text-t_text_green">Done</div>
+              <div className="mr-1 text-t_text_green">Done</div>
             </div>
           ) : transaction.status === "REVERTED" ? (
             <div className="flex items-center grow justify-end text-xs">
-              <div className="w-4 h-4 mr-1 text-t_text_red">Reverted</div>
+              <div className="mr-1 text-t_text_red">Reverted</div>
             </div>
           ) : null}
 

package/src/components/TxDataCard/index.tsx

@@ -10,12 +10,16 @@ export const TxDataCard = ({ transaction }: Props) => {
   const { supportedChains, findTokenDataByAddressAndChain } = useSwapContext();
 
   const srcToken = findTokenDataByAddressAndChain(
-    transaction.tokenAddress.toLowerCase(),
+    transaction.sourceChainId === "mainnet-beta"
+      ? transaction.tokenAddress
+      : transaction.tokenAddress.toLowerCase(),
     transaction.sourceChainId,
   );
   const dstToken = transaction.tokenOutAddress
     ? findTokenDataByAddressAndChain(
-        transaction.tokenOutAddress?.toLowerCase(),
+        transaction.sourceChainId === "mainnet-beta"
+          ? transaction.tokenOutAddress
+          : transaction.tokenOutAddress?.toLowerCase(),
         transaction.targetChainId,
       )
     : undefined;

package/src/services/solana/jupiter/extract-swap-data.ts

@@ -89,8 +89,8 @@ export async function extractSolanaSwapData(
       initialPositions?.includes(index) && swap.inMint === inMint,
   );
 
-  const inAmountInDecimal = inSwapData.reduce((acc, curr) => {
-    return acc.plus(curr.inAmountInDecimal || 0);
+  const inAmount = inSwapData.reduce((acc, curr) => {
+    return acc.plus(new BigNumber(curr.inAmount || "0"));
   }, new BigNumber(0));
 
   const outMint = swapData[finalPosition]?.outMint;
@@ -98,9 +98,8 @@ export async function extractSolanaSwapData(
     (swap, index) =>
       finalPositions?.includes(index) && swap.outMint === outMint,
   );
-
-  const outAmountInDecimal = outSwapData.reduce((acc, curr) => {
-    return acc.plus(curr.outAmountInDecimal || 0);
+  const outAmount = outSwapData.reduce((acc, curr) => {
+    return acc.plus(new BigNumber(curr.outAmount || "0"));
   }, new BigNumber(0));
 
   const isSuccessful = tx.meta?.status?.Ok === null;
@@ -110,10 +109,10 @@ export async function extractSolanaSwapData(
   swap.hash = signature;
   swap.timestamp = tx.blockTime ?? 0;
 
-  swap.amountWei = inAmountInDecimal.toString();
+  swap.amountWei = inAmount.toString();
   swap.tokenAddress = inMint;
 
-  swap.tokenOutAmount = outAmountInDecimal.toString();
+  swap.tokenOutAmount = outAmount.toString();
   swap.tokenOutAddress = outMint;
 
   swap.sourceChainId = "mainnet-beta";