Merge pull request #195 from the-standard/202403-round

feat: fix swap rounding
the-standard · Apr 3, 2024 · bd6a88c · bd6a88c
2 parents 456b99f + 72ba332
commit bd6a88c
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/src/components/collateral/actions/Swap.tsx b/src/components/collateral/actions/Swap.tsx
@@ -36,8 +36,7 @@ const Swap: React.FC<SwapProps> = ({
   const [swapLoading, setSwapLoading] = useState<any>(false);
   const [swapAssets, setSwapAssets] = useState<any>();
   const [amount, setAmount] = useState<any>(0);
-  // const [receiveAmount, setReceiveAmount] = useState<any>(0);
-  const [receiveAmountFormatted, setReceiveAmountFormatted] = useState<any>(0);
+  const [receiveAmount, setReceiveAmount] = useState<any>(0);
   const [receiveAsset, setReceiveAsset] = useState<any>('');
   const [receiveDecimals, setReceiveDecimals] = useState<any>();
   const { vaultStore } = useVaultStore();
@@ -61,21 +60,21 @@ const Swap: React.FC<SwapProps> = ({
   };
 
   const handleMinReturn = (e: any) => {
-    setReceiveAmountFormatted(parseUnits(e.target.value.toString(), receiveDecimals));
+    setReceiveAmount(parseUnits(e.target.value.toString(), receiveDecimals));
   };
 
   const getSwapConversion = async () => {
     try {
       setSwapLoading(true);
       const swapIn = symbol;
       const swapOut = receiveAsset;
-      const swapAmount = parseUnits(amount.toString(), decimals).toString();
+      const swapAmount = amount.toString();
       const response = await axios.get(
         `https://smart-vault-api.thestandard.io/estimate_swap?in=${swapIn}&out=${swapOut}&amount=${swapAmount}`
       );
       const data = response.data;
-      setReceiveAmountFormatted(parseUnits(data.toString(), receiveDecimals));
-      inputReceiveRef.current.value = parseUnits(data.toString(), receiveDecimals);
+      setReceiveAmount(BigInt(data));
+      inputReceiveRef.current.value = formatUnits(data.toString(), receiveDecimals);
       setSwapLoading(false);
     } catch (error) {
       console.log(error);
@@ -121,12 +120,9 @@ const Swap: React.FC<SwapProps> = ({
           ethers.utils.formatBytes32String(symbol),
           ethers.utils.formatBytes32String(receiveAsset),
           amount,
-          receiveAmountFormatted,
-          // parseUnits(amount.toString(), decimals),
-          // parseUnits(receiveAmountFormatted.toString(), receiveDecimals),
+          receiveAmount,
         ],
     });
-      // getSnackBar('SUCCESS', 'Success!');
     } catch (error: any) {
       let errorMessage: any = '';
       if (error && error.shortMessage) {
@@ -147,15 +143,15 @@ const Swap: React.FC<SwapProps> = ({
       setSwapLoading(false);
       inputRef.current.value = "";
       setAmount(0);
-      setReceiveAmountFormatted(0);
+      setReceiveAmount(0);
       setReceiveAsset('');
     } else if (isError) {
       getSnackBar('ERROR', 'There was an error');
       getCircularProgress(false);
       setSwapLoading(false);
       inputRef.current.value = "";
       setAmount(0);
-      setReceiveAmountFormatted(0);
+      setReceiveAmount(0);
       setReceiveAsset('');
     }
   }, [
@@ -337,7 +333,7 @@ const Swap: React.FC<SwapProps> = ({
               // value={swapLoading ? (
               //   ''
               // ) : (
-              //   receiveAmountFormatted
+              //   receiveAmount
               // )}
               ref={inputReceiveRef}
               type="number"
@@ -402,7 +398,7 @@ const Swap: React.FC<SwapProps> = ({
               isDisabled={
                 !amount||
                 !receiveAsset ||
-                !(receiveAmountFormatted > 0) ||
+                !(receiveAmount > 0) ||
                 swapLoading
               }
               isSuccess={!swapLoading}